diff options
author | cvs2svn <> | 2002-11-15 01:42:37 +0300 |
---|---|---|
committer | cvs2svn <> | 2002-11-15 01:42:37 +0300 |
commit | ba23bdcc321e9bf6c4e643814cf6ee37c86c5c50 (patch) | |
tree | 7026c59d151cb150ad58a6d769c656b3c69ff5cd | |
parent | d1109236e2835bec428fd7779bdb9b673aeec7fb (diff) |
This commit was manufactured by cvs2svn to create tagcarlton_dictionary-20021115-merge
'carlton_dictionary-20021115-merge'.
Sprout from drow-cplus-branch 2002-10-03 19:08:54 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'drow-cplus-'
Cherrypick from master 2002-11-14 22:42:36 UTC DJ Delorie <dj@redhat.com> '* Makefile.tpl: syntactic cleanup':
ChangeLog
Makefile.def
Makefile.in
Makefile.tpl
config/ChangeLog
configure.in
include/ChangeLog
include/ansidecl.h
include/bfdlink.h
include/elf/ChangeLog
include/elf/sh.h
include/getopt.h
include/opcode/ChangeLog
include/opcode/cgen.h
include/opcode/tic4x.h
include/partition.h
Delete:
config/mpw-mh-mpw
config/mpw/ChangeLog
config/mpw/MoveIfChange
config/mpw/README
config/mpw/forward-include
config/mpw/g-mpw-make.sed
config/mpw/mpw-touch
config/mpw/mpw-true
config/mpw/null-command
config/mpw/open-brace
config/mpw/tr-7to8-src
config/mpw/true
-rw-r--r-- | ChangeLog | 25 | ||||
-rw-r--r-- | Makefile.def | 1 | ||||
-rw-r--r-- | Makefile.in | 20 | ||||
-rw-r--r-- | Makefile.tpl | 73 | ||||
-rw-r--r-- | config/ChangeLog | 6 | ||||
-rw-r--r-- | config/mpw-mh-mpw | 157 | ||||
-rw-r--r-- | config/mpw/ChangeLog | 53 | ||||
-rw-r--r-- | config/mpw/MoveIfChange | 19 | ||||
-rw-r--r-- | config/mpw/README | 23 | ||||
-rw-r--r-- | config/mpw/forward-include | 3 | ||||
-rw-r--r-- | config/mpw/g-mpw-make.sed | 293 | ||||
-rw-r--r-- | config/mpw/mpw-touch | 7 | ||||
-rw-r--r-- | config/mpw/mpw-true | 1 | ||||
-rw-r--r-- | config/mpw/null-command | 1 | ||||
-rw-r--r-- | config/mpw/open-brace | 4 | ||||
-rw-r--r-- | config/mpw/tr-7to8-src | 9 | ||||
-rw-r--r-- | config/mpw/true | 1 | ||||
-rw-r--r-- | configure.in | 11 | ||||
-rw-r--r-- | include/ChangeLog | 30 | ||||
-rw-r--r-- | include/ansidecl.h | 5 | ||||
-rw-r--r-- | include/bfdlink.h | 5 | ||||
-rw-r--r-- | include/elf/ChangeLog | 4 | ||||
-rw-r--r-- | include/elf/sh.h | 16 | ||||
-rw-r--r-- | include/getopt.h | 8 | ||||
-rw-r--r-- | include/opcode/ChangeLog | 4 | ||||
-rw-r--r-- | include/opcode/cgen.h | 16 | ||||
-rw-r--r-- | include/opcode/tic4x.h | 16 | ||||
-rw-r--r-- | include/partition.h | 4 |
28 files changed, 194 insertions, 621 deletions
@@ -1,3 +1,28 @@ +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. diff --git a/Makefile.def b/Makefile.def index 754b79ee0..ae4b2e6fa 100644 --- a/Makefile.def +++ b/Makefile.def @@ -77,3 +77,4 @@ target_modules = { module= libjava; }; target_modules = { module= zlib; }; target_modules = { module= boehm-gc; }; target_modules = { module= qthreads; }; +target_modules = { module= rda; }; diff --git a/Makefile.in b/Makefile.in index ce4bffa88..6f7689785 100644 --- a/Makefile.in +++ b/Makefile.in @@ -760,7 +760,8 @@ ALL_TARGET_MODULES = \ all-target-libjava \ all-target-zlib \ all-target-boehm-gc \ - all-target-qthreads + all-target-qthreads \ + all-target-rda # This is a list of the configure targets for all of the modules which # are compiled using the target tools. @@ -779,7 +780,8 @@ CONFIGURE_TARGET_MODULES = \ configure-target-libjava \ configure-target-zlib \ configure-target-boehm-gc \ - configure-target-qthreads + configure-target-qthreads \ + configure-target-rda # This is a list of the check targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). @@ -795,7 +797,8 @@ CHECK_TARGET_MODULES = \ check-target-libjava \ check-target-zlib \ check-target-boehm-gc \ - check-target-qthreads + check-target-qthreads \ + check-target-rda # This is a list of the install targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). @@ -812,7 +815,8 @@ INSTALL_TARGET_MODULES = \ install-target-libjava \ install-target-zlib \ install-target-boehm-gc \ - install-target-qthreads + install-target-qthreads \ + install-target-rda # This is a list of the targets for which we can do a clean-{target}. CLEAN_MODULES = \ @@ -892,7 +896,8 @@ CLEAN_TARGET_MODULES = \ clean-target-libjava \ clean-target-zlib \ clean-target-boehm-gc \ - clean-target-qthreads + clean-target-qthreads \ + clean-target-rda # All of the x11 modules that can be cleaned CLEAN_X11_MODULES = \ @@ -1527,8 +1532,8 @@ all-gcc: # In theory, on an SMP all those dependencies can be resolved # in parallel. # -.PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean -bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean: all-bootstrap +.PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap +bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap: all-bootstrap @r=`${PWD}`; export r; \ s=`cd $(srcdir); ${PWD}`; export s; \ $(SET_LIB_PATH) \ @@ -1762,6 +1767,7 @@ all-target-libjava: configure-target-libjava all-target-zlib: configure-target-zlib all-target-boehm-gc: configure-target-boehm-gc all-target-qthreads: configure-target-qthreads +all-target-rda: configure-target-rda ### other supporting targets diff --git a/Makefile.tpl b/Makefile.tpl index 5ef7d55fa..7428f4124 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -1,4 +1,4 @@ -[+ AutoGen5 template +[+ AutoGen5 template -*- Mode: Makefile -*- in +] @@ -522,8 +522,10 @@ CONFIGURE_BUILD_MODULES = \ # This is a list of the targets for all of the modules which are compiled # using $(FLAGS_TO_PASS). -ALL_MODULES = [+ FOR host_modules +]\ - all-[+module+] [+ ENDFOR host_modules +]\ +ALL_MODULES =[+ + FOR host_modules +] \ + all-[+module+][+ + ENDFOR host_modules +] \ $(EXTRA_TARGET_HOST_ALL_MODULES) # This is a list of the check targets for all of the modules which are @@ -539,16 +541,25 @@ NATIVE_CHECK_MODULES = \ check-flex \ check-zip -CROSS_CHECK_MODULES = [+ FOR host_modules +][+ IF no_check +][+ ELIF no_check_cross +][+ ELSE x +]\ - check-[+module+] [+ ENDIF no_check +][+ ENDFOR host_modules +]\ +CROSS_CHECK_MODULES =[+ + FOR host_modules +][+ + IF (not (or (exist? "no_check_cross") (exist? "no_check"))) + +] \ + check-[+module+][+ + ENDIF no_check +][+ + ENDFOR host_modules +] \ $(EXTRA_TARGET_HOST_CHECK_MODULES) CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES) # This is a list of the install targets for all of the modules which are # compiled using $(FLAGS_TO_PASS). -INSTALL_MODULES = [+ FOR host_modules+][+ IF no_install +][+ ELSE no_install +]\ - install-[+module+] [+ ENDIF no_install +][+ ENDFOR host_modules +]\ +INSTALL_MODULES =[+ + FOR host_modules+][+ + IF (not (exist? "no_install")) +] \ + install-[+module+][+ + ENDIF no_install +][+ + ENDFOR host_modules +] \ $(EXTRA_TARGET_HOST_INSTALL_MODULES) # This is a list of the targets for all of the modules which are compiled @@ -583,31 +594,51 @@ INSTALL_X11_MODULES = \ # This is a list of the targets for all of the modules which are compiled # using $(TARGET_FLAGS_TO_PASS). -ALL_TARGET_MODULES = [+ FOR target_modules +]\ - all-target-[+module+] [+ ENDFOR target_modules +] +ALL_TARGET_MODULES =[+ + FOR target_modules +] \ + all-target-[+module+][+ + ENDFOR target_modules +] # This is a list of the configure targets for all of the modules which # are compiled using the target tools. -CONFIGURE_TARGET_MODULES = [+ FOR target_modules +]\ - configure-target-[+module+] [+ ENDFOR target_modules +] +CONFIGURE_TARGET_MODULES =[+ + FOR target_modules +] \ + configure-target-[+module+][+ + ENDFOR target_modules +] # This is a list of the check targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). -CHECK_TARGET_MODULES = [+ FOR target_modules +][+ IF no_check +][+ ELSE check +]\ - check-target-[+module+] [+ ENDIF no_check +][+ ENDFOR target_modules +] +CHECK_TARGET_MODULES =[+ + FOR target_modules +][+ + IF (not (exist? "no_check")) +] \ + check-target-[+module+][+ + ENDIF no_check +][+ + ENDFOR target_modules +] # This is a list of the install targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). -INSTALL_TARGET_MODULES = [+ FOR target_modules +][+ IF no_install +][+ ELSE install +]\ - install-target-[+module+] [+ ENDIF no_install +][+ ENDFOR target_modules +] +INSTALL_TARGET_MODULES =[+ + FOR target_modules +][+ + IF (not (exist? "no_install")) +] \ + install-target-[+module+][+ + ENDIF no_install +][+ + ENDFOR target_modules +] # This is a list of the targets for which we can do a clean-{target}. -CLEAN_MODULES = [+ FOR host_modules +][+ IF no_clean +][+ ELSE no_clean +]\ - clean-[+module+] [+ ENDIF no_clean +][+ ENDFOR host_modules +] +CLEAN_MODULES =[+ + FOR host_modules +][+ + IF (not (exist? "no_clean")) +] \ + clean-[+module+][+ + ENDIF no_clean +][+ + ENDFOR host_modules +] # All of the target modules that can be cleaned -CLEAN_TARGET_MODULES = [+ FOR target_modules +][+ IF no_clean +][+ ELSE clean +]\ - clean-target-[+module+] [+ ENDIF no_clean +][+ ENDFOR target_modules +] +CLEAN_TARGET_MODULES =[+ + FOR target_modules +][+ + IF (not (exist? "no_clean")) +] \ + clean-target-[+module+][+ + ENDIF no_clean +][+ + ENDFOR target_modules +] # All of the x11 modules that can be cleaned CLEAN_X11_MODULES = \ @@ -1242,8 +1273,8 @@ all-gcc: # In theory, on an SMP all those dependencies can be resolved # in parallel. # -.PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean -bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean: all-bootstrap +.PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap +bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap: all-bootstrap @r=`${PWD}`; export r; \ s=`cd $(srcdir); ${PWD}`; export s; \ $(SET_LIB_PATH) \ diff --git a/config/ChangeLog b/config/ChangeLog index 129ce6168..3f985d32a 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,9 @@ +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. diff --git a/config/mpw-mh-mpw b/config/mpw-mh-mpw deleted file mode 100644 index 543ef4fb2..000000000 --- a/config/mpw-mh-mpw +++ /dev/null @@ -1,157 +0,0 @@ -# This is an MPW makefile fragment. - -# Since there are a multiplicity of Mac compilers and two different -# processors, this file is primarily a library of options for each -# compiler. Somebody else (such as a configure or build script) will -# make the actual choice. - -# Compiler to use for compiling. - -CC_MPW_C = C -d MPW_C -d ALMOST_STDC -d ANSI_PROTOTYPES -d MPW -mc68020 -model far -b -w - -CC_SC = SC -d ALMOST_STDC -d ANSI_PROTOTYPES -d MPW -mc68020 -model far -b -i '' -i : - -CC_MWC68K = MWC68K -d MPW -enum int -mpw_chars -sym on -w off -mc68020 -model far - -CC_PPCC = PPCC -d powerc=1 -d pascal= -d ALMOST_STDC -d ANSI_PROTOTYPES -d MPW -w - -CC_MRC = MrC -d powerc=1 -d pascal= -d ALMOST_STDC -d ANSI_PROTOTYPES -d MPW -i '' -i : -jm - -CC_SMrC = SMrC -d MPW - -# "-mpw_chars" is necessary because GNU sources often mix signed and -# unsigned casually. -# "-w off" is not a great idea, but CW7 is complaining about enum -# assignments. -# "-opt global,peep,l4,speed" is sometimes good, and sometimes bad. -# We must use {CIncludes} so that MPW tools will work; {MWCIncludes} -# defines stdout, islower, etc, in ways that are incompatible with MPW's -# runtime. However, this cannot be done via -i "{CIncludes}", since -# that does not affect how <>-type includes happen; instead, the variable -# MWCIncludes must be set to point at {CIncludes}. - -CC_MWCPPC = MWCPPC -d MPW -enum int -mpw_chars -sym on -w off - -# Note that GCC does *not* wire in a definition of "pascal", so that -# it can be handled in another way if desired. - -CC_68K_GCC = gC -Dpascal= -DANSI_PROTOTYPES -DMPW - -CC_PPC_GCC = gC -Dpowerc=1 -Dpascal= -DANSI_PROTOTYPES -DMPW - -# Nothing for the default CFLAGS. - -CFLAGS = - -# Tool to use for making libraries/archives. - -AR_LIB = Lib - -AR_MWLINK68K = MWLink68K -xm library - -AR_PPCLINK = PPCLink -xm library - -AR_MWLINKPPC = MWLinkPPC -xm library - -AR_AR = ar - -AR_FLAGS = -o - -RANLIB_NULL = null-command - -RANLIB_RANLIB = ranlib - -# Compiler and/or linker to use for linking. - -CC_LD_LINK = Link -w -d -model far {CC_LD_TOOL_FLAGS} - -CC_LD_MWLINK68K = MWLink68K -w {CC_LD_TOOL_FLAGS} -sym on -model far - -CC_LD_PPCLINK = PPCLink -main __start -outputformat xcoff - -CC_LD_MWLINKPPC = MWLinkPPC -w {CC_LD_TOOL_FLAGS} -sym on - -CC_LD_GLD = gC - -# Extension for linker output. - -PROG_EXT_68K = - -PROG_EXT_XCOFF = .xcoff - -# Nothing for the default LDFLAGS. - -LDFLAGS = -w - -CC_LD_TOOL_FLAGS = -c 'MPS ' -t MPST - -# Libraries to link against. - -# It would appear that the math libraries are not -# needed except to provide a definition for scalb, -# which is called from ldexp, which is referenced -# in the m68k opcodes library. - -EXTRALIBS_C = \Option-d - "{CLibraries}"StdClib.o \Option-d - "{CLibraries}"Math.o \Option-d - "{CLibraries}"CSANELib.o \Option-d - "{Libraries}"Stubs.o \Option-d - "{Libraries}"Runtime.o \Option-d - "{Libraries}"Interface.o \Option-d - "{Libraries}"ToolLibs.o - -EXTRALIBS_MWC68K = \Option-d - "{CLibraries}"StdClib.o \Option-d - "{CLibraries}"Math.o \Option-d - "{CLibraries}"CSANELib.o \Option-d - "{Libraries}"Stubs.o \Option-d - "{Libraries}"Runtime.o \Option-d - "{Libraries}"Interface.o \Option-d - "{Libraries}"ToolLibs.o \Option-d - "{MW68KLibraries}MPW ANSI (4i) C.68K.Lib" - -EXTRALIBS_PPC_XCOFF = \Option-d - "{PPCLibraries}"StdCRuntime.o \Option-d - "{PPCLibraries}"InterfaceLib.xcoff \Option-d - "{PPCLibraries}"MathLib.xcoff \Option-d - "{PPCLibraries}"StdCLib.xcoff \Option-d - "{PPCLibraries}"PPCToolLibs.o \Option-d - "{PPCLibraries}"PPCCRuntime.o \Option-d - "{GCCPPCLibraries}"libgcc.xcoff - -EXTRALIBS_PPC = \Option-d - "{PPCLibraries}"StdCRuntime.o \Option-d - "{SharedLibraries}"InterfaceLib \Option-d - "{SharedLibraries}"MathLib \Option-d - "{SharedLibraries}"StdCLib \Option-d - "{PPCLibraries}"PPCToolLibs.o \Option-d - "{PPCLibraries}"PPCCRuntime.o \Option-d - "{GCCPPCLibraries}"libgcc.xcoff - -EXTRALIBS_MWCPPC = \Option-d - "{MWPPCLibraries}"MWStdCRuntime.Lib \Option-d - "{MWPPCLibraries}"InterfaceLib \Option-d - "{MWPPCLibraries}"StdCLib \Option-d - "{MWPPCLibraries}"MathLib \Option-d - "{MWPPCLibraries}"PPCToolLibs.o - -# Tool to make PEF with, if needed. - -MAKEPEF_NULL = null-command - -MAKEPEF_PPC = MakePEF - -MAKEPEF_FLAGS = \Option-d - -l InterfaceLib.xcoff=InterfaceLib \Option-d - -l MathLib.xcoff=MathLib \Option-d - -l StdCLib.xcoff=StdCLib - -MAKEPEF_TOOL_FLAGS = -ft MPST -fc 'MPS ' - -# Resource compiler to use. - -REZ_68K = Rez - -REZ_PPC = Rez -d WANT_CFRG - diff --git a/config/mpw/ChangeLog b/config/mpw/ChangeLog deleted file mode 100644 index 3cdefbf7a..000000000 --- a/config/mpw/ChangeLog +++ /dev/null @@ -1,53 +0,0 @@ -Tue Nov 26 12:34:12 1996 Stan Shebs <shebs@andros.cygnus.com> - - * g-mpw-make.sed: Fix some comments. - -Mon Sep 16 14:42:52 1996 Stan Shebs <shebs@andros.cygnus.com> - - * g-mpw-make.sed (HLDENV): Edit out all references. - -Thu Aug 15 19:49:23 1996 Stan Shebs <shebs@andros.cygnus.com> - - * true: New script, identical to mpw-true. - * g-mpw-make.sed: Add @DASH_C_FLAG@ and @SEGMENT_FLAG()@ - to the editors for compile commands. - -Thu Aug 1 15:01:42 1996 Stan Shebs <shebs@andros.cygnus.com> - - * mpw-true, mpw-touch, null-command: New scripts. - * README: Describe usage in more detail. - -Tue Dec 12 14:51:51 1995 Stan Shebs <shebs@andros.cygnus.com> - - * g-mpw-make.sed: Don't edit out "version=" occurrences. - -Fri Dec 1 11:46:18 1995 Stan Shebs <shebs@andros.cygnus.com> - - * g-mpw-make.sed (bindir, libdir): Edit the positions of - pathname separators to work with other pathnames better. - -Tue Nov 7 15:08:07 1995 Stan Shebs <shebs@andros.cygnus.com> - - * g-mpw-make.sed: Add comment about Duplicate vs Catenate, - add additional pattern for editing link-compile commands. - -Tue Oct 24 14:28:51 1995 Stan Shebs <shebs@andros.cygnus.com> - - * g-mpw-make.sed: Add handling for *.tab.[hc] files. - (CHILL_FOR_TARGET, CHILL_LIB): Edit out tricky definitions - of these. - -Thu Sep 28 21:05:10 1995 Stan Shebs <shebs@andros.cygnus.com> - - * g-mpw-make.sed: New file, generic sed commands to translate - Unix makefiles into MPW makefile syntax. - -Fri Mar 17 11:51:20 1995 Stan Shebs <shebs@andros.cygnus.com> - - * README: Clarify instructions. - * fi: Remove. - -Wed Dec 21 15:45:53 1994 Stan Shebs <shebs@andros.cygnus.com> - - * MoveIfChange, README, fi, forward-include, open-brace, - tr-7to8-src: New files. diff --git a/config/mpw/MoveIfChange b/config/mpw/MoveIfChange deleted file mode 100644 index 0dbc12582..000000000 --- a/config/mpw/MoveIfChange +++ /dev/null @@ -1,19 +0,0 @@ -# Rename a file only if it is different from a previously existing -# file of the same name. This is useful for keeping make from doing -# too much work if the contents of a file haven't changed. - -# This is an MPW translation of the standard GNU sh script move-if-change. - -Set exit 0 - -If "`exists -f "{2}"`" - Compare "{1}" "{2}" >dev:null - If {status} != 0 - Rename -y "{1}" "{2}" - Else - Echo "{2}" is unchanged - Delete -i -y "{1}" - End -Else - Rename -y "{1}" "{2}" -End diff --git a/config/mpw/README b/config/mpw/README deleted file mode 100644 index 554700adc..000000000 --- a/config/mpw/README +++ /dev/null @@ -1,23 +0,0 @@ -This directory contains MPW scripts and related files that are needed to -build Cygnus GNU tools for MPW. The scripts should be somewhere on the -command path; our usual practice has been to have a separate directory -for the scripts, and put the tools (byacc, flex, and sed at least) there -also; then it's easier to drag the support bits around as a group, or to -upgrade MPW versions. The complete package of scripts and tool binaries -is usually available as pub/mac/buildtools.cpt.hqx on ftp.cygnus.com. - -"tr-7to8-src" is actually the source to an MPW script that transforms -sequences like "\Option-d" into the actual 8-bit chars that MPW needs. -It's only the source because it can't itself include any 8-bit chars. -It *can* be processed into a genuine "tr-7to8" by using itself: - - tr-7to8 tr-7to8-src | sed -e 's/Src//' >new-tr-7to8 - -Use this to verify: - - compare tr-7to8 new-tr-7to8 - -If you don't have a working tr-7to8, then you will have to manually -replace all occurrences of "\Option-d" with real Option-d (which looks -like a delta), then do similarly with all the other "\Option-..." -strings, and then change "\SrcOption-d" into the string "\Option-d". diff --git a/config/mpw/forward-include b/config/mpw/forward-include deleted file mode 100644 index ddd6bd711..000000000 --- a/config/mpw/forward-include +++ /dev/null @@ -1,3 +0,0 @@ -Echo '#include' ¶""{1}"¶" >"{2}".tem -MoveIfChange "{2}".tem "{2}" - diff --git a/config/mpw/g-mpw-make.sed b/config/mpw/g-mpw-make.sed deleted file mode 100644 index e7d3c7707..000000000 --- a/config/mpw/g-mpw-make.sed +++ /dev/null @@ -1,293 +0,0 @@ -# Sed commands to translate Unix makefiles into MPW makefiles. -# These are nominally generic, but work best on the makefiles used -# for GNU programs. - -# Whack out any commented-out lines that are probably commands; -# they can only cause trouble later on. -/^# /d - -# Change dependency char. -/:$/s/:/ \\Option-f/g -/^[^ :#][^:]*:/s/\([ ]*\):\([ ]*\)/ \\Option-f /g - -# Change syntax of Makefile vars. -/\$/s/\${\([a-zA-Z0-9_-]*\)}/{\1}/g -/\$/s/\$(\([a-zA-Z0-9_-]*\))/{\1}/g -/ $@/s/ $@/ {Targ}/ - -# Double-$ are literals to Unix but not to MPW make. -/\$\$/s/\$\$/$/g - -# Change pathname syntax. -/\//s,\.\./\/\.\./,:::,g -/\//s,\.\./,::,g -/\.\//s,\./,:,g -/\//s,/,:,g -# Undo excess changes. -/and/s,and:or$,and/or, -/and/s,and:or ,and/or , -/want/s,want:need,want/need, -# Fixing up sed commands. -/-e/s_":\([^:]*\):d"_"/\1/d"_g -/-e/s_":\([^:]*\):,:\([^:]*\):d"_"/\1/,/\2/d"_g - -/=/s/ = \.$/ = :/ - -# Make these go away so that later edits not confused. -/HLDENV/s/{HLDENV}// - -# Comment out any explicit srcdir setting. -/srcdir/s/^srcdir/# srcdir/ - -/BASEDIR/s/^BASEDIR =.*$/BASEDIR = "{srcroot}"/ -/{BASEDIR}:/s/{BASEDIR}:/{BASEDIR}/g -/{srcdir}:/s/{srcdir}:/"{srcdir}"/g -/"{srcdir}":/s/"{srcdir}":/"{srcdir}"/g - -# Tweak some conventions that are backwards for the Mac. -/bindir/s/{exec_prefix}:bin/{exec_prefix}bin:/ -/libdir/s/{exec_prefix}:lib/{exec_prefix}lib:/ - -# Comment out settings of anything set by mpw host config. -/CC/s/^CC *=/#CC =/ -/CFLAGS/s/^CFLAGS *=/#CFLAGS =/ -/AR/s/^AR *=/#AR =/ -/AR_FLAGS/s/^AR_FLAGS *=/#AR_FLAGS =/ -/RANLIB/s/^RANLIB *=/#RANLIB =/ -/CC_LD/s/^CC_LD *=/#CC_LD =/ -/LDFLAGS/s/^LDFLAGS *=/#LDFLAGS =/ - -# Change -I usages. -/-I/s/-I\./-i :/g -/-I/s/-I::bfd/-i ::bfd:/g -/-I/s/-I::include/-i ::include:/g -/-I/s/-I/-i /g - -# Change -D usage. -/-D/s/\([ =]\)-D\([^ ]*\)/\1-d \2/g - -# Change continuation char. -/\\$/s/\\$/\\Option-d/ - -# Change wildcard char. -/\*/s/\*/\\Option-x/g - -# Change path of various types of source files. This rule does not allow -# for file names with multiple dots in the name. -/\.[chly]/s/\([ ><=]\)\([-a-zA-Z0-9_${}:"]*\)\.\([chly]\)/\1"{s}"\2.\3/g -/\.[chly]/s/^\([-a-zA-Z0-9_${}:"]*\)\.\([chly]\)/"{s}"\1.\2/ -# Allow files named *.tab.[ch] as a special case. -/\.tab\.[ch]/s/\([ ><=]\)\([-a-zA-Z0-9_${}:"]*\.tab\)\.\([ch]\)/\1"{s}"\2.\3/g -/\.tab\.[ch]/s/^\([-a-zA-Z0-9_${}:"]*\.tab\)\.\([ch]\)/"{s}"\1.\2/ -# Fix some overenthusiasms. -/{s}/s/"{s}""{srcdir}"/"{srcdir}"/g -/{s}/s/"{s}"{\([a-zA-Z0-9_]*\)dir}/"{\1dir}"/g -/{s}/s/"{s}"{\([a-zA-Z0-9_]*\)DIR}/"{\1DIR}"/g -/{s}/s/"{s}""{\([a-zA-Z0-9_]*\)dir}"/"{\1dir}"/g -/{s}/s/"{s}""{\([a-zA-Z0-9_]*\)DIR}"/"{\1DIR}"/g -/{s}/s/"{s}":/:/g -/{s}/s/^"{s}"//g -/{s}/s/"{s}""{s}"/"{s}"/g -/{s}/s/"{s}""{srcdir}"/"{s}"/g -/{s}/s/"{srcdir}""{s}"/"{s}"/g - -# The .def files are also typically source files. -/\.def/s/\([ ><]\)\([-a-zA-Z0-9_${}:"]*\)\.def/\1"{s}"\2.def/g -/\.def/s/^\([-a-zA-Z0-9_${}:"]*\)\.def/"{s}"\1.def/g - -# Change extension and path of objects. -/\.o/s/\([ =]\)\([-a-zA-Z0-9_${}:"]*\)\.o/\1"{o}"\2.c.o/g -/\.o/s/^\([-a-zA-Z0-9_${}:"]*\)\.o/"{o}"\1.c.o/ -# Allow *.tab.o files as a special case of a 2-dot-name file. -/\.o/s/\([ =]\)\([-a-zA-Z0-9_${}:"]*\)\.tab\.o/\1"{o}"\2.tab.c.o/g -/\.o/s/^\([-a-zA-Z0-9_${}:"]*\)\.tab\.o/"{o}"\1.tab.c.o/ -# Clean up. -/"{o}"/s/"{o}""{o}"/"{o}"/g -/"{o}"/s/^"{o}"\([a-zA-Z0-9_]*\)=/\1=/ - -# Change extension of libs. -/\.a/s/lib\([a-z]*\)\.a/lib\1.o/g - -# Remove non-fail option. -/-/s/^\([ ]*\)-/\1/ -# Fix overeagernesses - assumes no one-letter commands. -/^[ ]*[a-z] /s/^\([ ]*\)\([a-z]\) /\1-\2 / - -# Remove non-echo option. (watch out for autoconf things) -/@/s/^\([ ]*\)@/\1/ - -# Change cp to Duplicate. -# Catenate is perhaps more accurate, but the pattern would have to -# identify the output file and add a '>' redirection into it. -/cp/s/^\([ ]*\)cp /\1Duplicate -d -y / -# Change mv to Rename. -/mv/s/^\([ ]*\)mv /\1Rename -y / -/Rename/s/^\([ ]*\)Rename -y -f/\1Rename -y/ -# Change rm to Delete. -/rm -rf/s/^\([ ]*\)rm -rf /\1Delete -i -y / -/rm -f/s/^\([ ]*\)rm -f /\1Delete -i -y / -/rm/s/^\([ ]*\)rm /\1Delete -i -y / -# Note that we don't mess with ln - directory-specific scripts -# must decide what to do with symlinks. -# Change cat to Catenate. -/cat/s/^\([ ]*\)cat /\1Catenate / -# Change touch to mpw-touch. -/touch/s/^\([ ]*\)touch /\1mpw-touch / -# Change mkdir to NewFolder. -/mkdir/s/^\([ ]*\)mkdir /\1NewFolder / -# Change var setting to Set. -/=/s/^\([ ]*\)\([-a-zA-Z0-9_]*\)=\([^;]*\); \\Option-d/\1Set \2 \3/ - -# Change tests. -/if /s/if \[ *-f \([^ ]*\) ] *; *\\Option-d/If "`Exists "\1"`" != ""/ -/if /s/if \[ *-f \([^ ]*\) ] *; *then *\\Option-d/If "`Exists "\1"`" != ""/ -/if /s/if \[ ! *-f \([^ ]*\) ] *; *\\Option-d/If "`Exists "\1"`" == ""/ -/if /s/if \[ ! *-f \([^ ]*\) ] *; *then \\Option-d/If "`Exists "\1"`" == ""/ - -/if /s/if \[ *-d \([^ ]*\) ] *; *\\Option-d/If "`Exists "\1"`" != ""/ -/if /s/if \[ *-d \([^ ]*\) ] *; *then *\\Option-d/If "`Exists "\1"`" != ""/ -/if /s/if \[ ! *-d \([^ ]*\) ] *; *\\Option-d/If "`Exists "\1"`" == ""/ -/if /s/if \[ ! *-d \([^ ]*\) ] *; *then *\\Option-d/If "`Exists "\1"`" == ""/ - -/if /s/if \[ -d \([^ ]*\) ] *; then true *; else mkdir \([^ ;]*\) *; fi/If "`Exists "\1"`" != "" NewFolder \2 End If/ - -/if /s/if \[ \([^ ]*\) = \([^ ]*\) ] *; *\\Option-d/If "\1" == "\2"/ -/if /s/if \[ \([^ ]*\) = \([^ ]*\) ] *; *then *\\Option-d/If "\1" == "\2"/ - -/if /s/if \[ \([^ ]*\) != \([^ ]*\) ] *; *\\Option-d/If "\1" != "\2"/ -/if /s/if \[ \([^ ]*\) != \([^ ]*\) ] *; *then *\\Option-d/If "\1" != "\2"/ - -/if /s/if \[ \([^ ]*\) -eq \([^ ]*\) ] *; *\\Option-d/If "\1" != "\2"/ -/if /s/if \[ \([^ ]*\) -eq \([^ ]*\) ] *; *then *\\Option-d/If "\1" != "\2"/ - -/^[ ]*else true$/c\ - Else\ - mpw-true\ - - -/else/s/^\([ ]*\)else[ ]*$/\1Else/ -/else/s/^\([ ]*\)else[; ]*\\Option-d$/\1Else/ - -/^[ ]*else[ ]*true[ ]*$/c\ - Else\ - mpw-true - -/^[ ]*else[ ]*true[; ]*fi$/c\ - Else\ - mpw-true\ - End If - -/fi/s/^\([ ]*\)fi *$/\1End/ -/fi/s/^\([ ]*\)fi *; *\\Option-d/\1End/ - -# Change looping. -/for/s/^\([ ]*\)for \([-a-zA-Z0-9_]*\) in \([^;]*\); *do *\\Option-d/\1For \2 In \3/ -/^\([ ]*\)do *\\Option-d/d -/done/s/^\([ ]*\)done *; *\\Option-d/\1End/ -/done/s/^\([ ]*\)done$/\1End/ - -# Trailing semicolons and continued lines are unneeded sh syntax. -/; \\Option-d/s/; \\Option-d// - -# Change move-if-change to MoveIfChange. -/move-if-change/s/\([^ ]*\)move-if-change/MoveIfChange/g - -# Change $(SHELL) to the script name by itself. -/SHELL/s/^\([ ]*\){SHELL} /\1/ - -# Change syntax of default rule dependency. -/^\.c\.o/s/^\.c\.o \\Option-f$/.c.o \\Option-f .c/ - -# Change default rule's action. -/{CC} -c/s/{CC} -c \(.*\) \$<$/{CC} @DASH_C_FLAG@ {DepDir}{Default}.c \1 @SEGMENT_FLAG({Default})@ -o {TargDir}{Default}.c.o/ - -# This is pretty disgusting, but I can't seem to detect empty rules. -/Option-f$/s/Option-f$/Option-f _oldest/g - -# Remove -c from explicit compiler calls. (but should not if GCC) -# Handle the case of a source file that is "{xxx}"file.c. -/ -c /s/{\([A-Z_]*\)CC}\(.*\) -c \(.*\)"\([^"]*\)"\([-a-z_]*\)\.c/{\1CC}\2 @DASH_C_FLAG@ \3"\4"\5.c -o "{o}"\5.c.o/ -# Handle the case of a source file that is "{xxx}"dir:file.c. -/ -c /s/{\([A-Z_]*\)CC}\(.*\) -c \(.*\)"\([^"]*\)"\([-a-z_]*\):\([-a-z_]*\)\.c/{\1CC}\2 @DASH_C_FLAG@ \3"\4"\5:\6.c -o "{o}"\6.c.o/ - -# Change linking cc to linking sequence. -/-o/s/^\([ ]*\){CC} \(.*\){\([A-Z_]*\)CFLAGS} \(.*\){LDFLAGS} \(.*\)-o \([^ ]*\) \(.*\)$/\1{CC_LD} \2 {\3CFLAGS} \4 {LDFLAGS} \5 -o \6{PROG_EXT} \7\ -\1{MAKEPEF} \6{PROG_EXT} -o \6 {MAKEPEF_TOOL_FLAGS} {MAKEPEF_FLAGS}\ -\1{REZ} "{s}"\6.r -o \6 -append -d PROG_NAME='"'\6'"' -d VERSION_STRING='"'{version}'"'/ -/-o/s/^\([ ]*\){CC} \(.*\){\([A-Z_]*\)CFLAGS} \(.*\)-o \([^ ]*\) \(.*\){LDFLAGS} \(.*\)$/\1{CC_LD} \2 {\3CFLAGS} \4 {LDFLAGS} \6 -o \5{PROG_EXT} \7\ -\1{MAKEPEF} \5{PROG_EXT} -o \5 {MAKEPEF_TOOL_FLAGS} {MAKEPEF_FLAGS}\ -\1{REZ} "{s}"\5.r -o \5 -append -d PROG_NAME='"'\5'"' -d VERSION_STRING='"'{version}'"'/ -/-o/s/^\([ ]*\){HOST_CC} \(.*\)-o \([^ ]*\) \(.*\)$/\1{HOST_CC_LD} \2 -o \3{PROG_EXT} \4\ -\1{MAKEPEF} \3{PROG_EXT} -o \3 {MAKEPEF_TOOL_FLAGS} {MAKEPEF_FLAGS}\ -\1{REZ} "{s}"\3.r -o \3 -append -d PROG_NAME='"'\3'"' -d VERSION_STRING='"'{version}'"'/ - -# Comment out .NOEXPORT rules. -/\.NOEXPORT/s/^\.NOEXPORT/#\.NOEXPORT/ -# Comment out .PHONY rules. -/\.PHONY/s/^\.PHONY/#\.PHONY/ -# Comment out .PRECIOUS rules. -/\.PRECIOUS/s/^\.PRECIOUS/#\.PRECIOUS/ -# Comment out .SUFFIXES rules. -/\.SUFFIXES/s/^\.SUFFIXES/#\.SUFFIXES/ - -# Set the install program appropriately. -/INSTALL/s/^INSTALL *= *`.*`:install.sh -c/INSTALL = Duplicate -y/ - -# Don't try to decide whether to use the tree's own tools. -/bison/s/`.*bison:bison.*`/bison -y/ -/byacc/s/`.*byacc:byacc.*`/byacc/ -/flex/s/`.*flex:flex.*`/flex/ - -# Turn transformed C comments in echo commands back into comments. -/echo/s,echo '\(.*\):\\Option-x\(.*\)\\Option-x:\(.*\)',echo '\1/*\2*/\3', - -# Whack out various clever expressions that search for tools, since -# the clever code is too /bin/sh specific. - -/^AR_FOR_TARGET = `/,/`$/c\ -AR_FOR_TARGET = ::binutils:ar\ - - -/^RANLIB_FOR_TARGET = `/,/`$/c\ -RANLIB_FOR_TARGET = ::binutils:ranlib\ - - -/^RANLIB_TEST_FOR_TARGET = /,/ranlib ] )$/c\ -RANLIB_TEST_FOR_TARGET = \ - - -/^EXPECT = `/,/`$/c\ -EXPECT = \ - - -/^RUNTEST = `/,/`$/c\ -RUNTEST = \ - - -/^CC_FOR_TARGET = `/,/`$/c\ -CC_FOR_TARGET = \ - - -/^CXX_FOR_TARGET = `/,/`$/c\ -CXX_FOR_TARGET = \ - - -/^CHILL_FOR_TARGET = `/,/`$/c\ -CHILL_FOR_TARGET = \ - - -/^CHILL_LIB = `/,/`$/c\ -CHILL_LIB = \ - -/sanit/s/{start-sanit...-[a-z0-9]*}// -/sanit/s/{end-sanit...-[a-z0-9]*}// - -# Add standard defines and default rules. -/^# srcdir/a\ -\ -s = "{srcdir}"\ -\ -o = :\ -\ -"{o}" \\Option-f : "{s}" - diff --git a/config/mpw/mpw-touch b/config/mpw/mpw-touch deleted file mode 100644 index c743a5122..000000000 --- a/config/mpw/mpw-touch +++ /dev/null @@ -1,7 +0,0 @@ -# "Touch" command. - -If "`Exists "{1}"`" != "" - SetFile -m . "{1}" -Else - Echo ' ' > "{1}" -End If diff --git a/config/mpw/mpw-true b/config/mpw/mpw-true deleted file mode 100644 index 0506530d3..000000000 --- a/config/mpw/mpw-true +++ /dev/null @@ -1 +0,0 @@ -Exit 0 diff --git a/config/mpw/null-command b/config/mpw/null-command deleted file mode 100644 index 4844c8ec5..000000000 --- a/config/mpw/null-command +++ /dev/null @@ -1 +0,0 @@ -# This command does nothing. diff --git a/config/mpw/open-brace b/config/mpw/open-brace deleted file mode 100644 index 58465dcc1..000000000 --- a/config/mpw/open-brace +++ /dev/null @@ -1,4 +0,0 @@ -# MPW makefiles seem not to have any way to get a literal open -# brace into a rule anywhere, so this does the job. - -Echo '{' diff --git a/config/mpw/tr-7to8-src b/config/mpw/tr-7to8-src deleted file mode 100644 index b20b649c8..000000000 --- a/config/mpw/tr-7to8-src +++ /dev/null @@ -1,9 +0,0 @@ -StreamEdit -e \Option-d - '/\Option-x/ \Option-d - Replace /\Option-d\SrcOption-d/ "\Option-d\Option-d" -c \Option-5 ; \Option-d - Replace /\Option-d\SrcOption-f/ "\Option-d\Option-f" -c \Option-5 ; \Option-d - Replace /\Option-d\SrcOption-8/ "\Option-d\Option-8" -c \Option-5 ; \Option-d - Replace /\Option-d\SrcOption-5/ "\Option-d\Option-5" -c \Option-5 ; \Option-d - Replace /\Option-d\SrcOption-x/ "\Option-d\Option-x" -c \Option-5 ; \Option-d - Replace /\Option-d\SrcOption-r/ "\Option-d\Option-r" -c \Option-5' \Option-d - "{1}" diff --git a/config/mpw/true b/config/mpw/true deleted file mode 100644 index 0506530d3..000000000 --- a/config/mpw/true +++ /dev/null @@ -1 +0,0 @@ -Exit 0 diff --git a/configure.in b/configure.in index 8988bef27..21b86fde4 100644 --- a/configure.in +++ b/configure.in @@ -76,7 +76,7 @@ target_libs="target-libiberty \ # list belongs in this list. those programs are also very likely # candidates for the "native_only" list which follows # -target_tools="target-examples target-groff target-gperf" +target_tools="target-examples target-groff target-gperf target-rda" ################################################################################ @@ -361,7 +361,7 @@ case "${target}" in avr-*-*) noconfigdirs="$noconfigdirs target-libiberty ${libstdcxx_version} ${libgcj}" ;; - c4x-*-*) + c4x-*-* | tic4x-*-*) noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss ${libgcj}" ;; c54x*-*-* | tic54x-*-*) @@ -422,6 +422,13 @@ case "${target}" in noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; i[3456]86-*-linux*) + # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's + # not build java stuff by default. + case "${target}" in + *-*-*libc1*) + noconfigdirs="$noconfigdirs ${libgcj}";; + esac + # 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 diff --git a/include/ChangeLog b/include/ChangeLog index 257e38193..2dfed5ae4 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,33 @@ +2002-11-14 Egor Duda <deo@logos-m.ru> + + * bfdlink.h (struct bfd_link_info): Add new boolean + field pei386_runtime_pseudo_reloc. + +2002-11-11 Svein E. Seldal <Svein.Seldal@solidas.com> + + * opcode/tic4x.h: Added new opcodes and corrected some bugs. Add + support for new DSP types. + +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 Jakub Jelinek <jakub@redhat.com> * elf/x86-64.h: Add TLS relocs. diff --git a/include/ansidecl.h b/include/ansidecl.h index 9a7c5777f..d169b4f50 100644 --- a/include/ansidecl.h +++ b/include/ansidecl.h @@ -136,10 +136,13 @@ So instead we use the macro below and test it against specific values. */ #define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__) #endif /* GCC_VERSION */ -#if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(_WIN32) +#if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(_WIN32) || (defined(__alpha) && defined(__cplusplus)) /* 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 * diff --git a/include/bfdlink.h b/include/bfdlink.h index 4998fe3db..9263bcc12 100644 --- a/include/bfdlink.h +++ b/include/bfdlink.h @@ -340,6 +340,11 @@ struct bfd_link_info 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; + /* True if non-PLT relocs should be merged into one reloc section and sorted so that relocs against the same symbol come together. */ boolean combreloc; diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index 254b2c425..65f3160af 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,3 +1,7 @@ +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> diff --git a/include/elf/sh.h b/include/elf/sh.h index af78c9bb0..ef964d685 100644 --- a/include/elf/sh.h +++ b/include/elf/sh.h @@ -167,7 +167,17 @@ START_RELOC_NUMBERS (elf_sh_reloc_type) RELOC_NUMBER (R_SH_DIR10SL, 50) RELOC_NUMBER (R_SH_DIR10SQ, 51) FAKE_RELOC (R_SH_FIRST_INVALID_RELOC_3, 52) - FAKE_RELOC (R_SH_LAST_INVALID_RELOC_3, 159) + 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) @@ -205,8 +215,8 @@ START_RELOC_NUMBERS (elf_sh_reloc_type) 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_4, 197) - FAKE_RELOC (R_SH_LAST_INVALID_RELOC_4, 241) + FAKE_RELOC (R_SH_FIRST_INVALID_RELOC_5, 197) + FAKE_RELOC (R_SH_LAST_INVALID_RELOC_5, 241) RELOC_NUMBER (R_SH_SHMEDIA_CODE, 242) RELOC_NUMBER (R_SH_PT_16, 243) RELOC_NUMBER (R_SH_IMMS16, 244) diff --git a/include/getopt.h b/include/getopt.h index 0c6470b3d..a99a22901 100644 --- a/include/getopt.h +++ b/include/getopt.h @@ -1,6 +1,6 @@ /* Declarations for getopt. - Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000 - Free Software Foundation, Inc. + 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. @@ -108,11 +108,13 @@ struct option #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 stdlib.h. To avoid compilation + 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 */ diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index ab908ec92..af5707e8e 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,3 +1,7 @@ +2002-10-14 Alan Modra <amodra@bigpond.net.au> + + * cgen.h: Test __BFD_H_SEEN__ rather than BFD_VERSION_DATE. + 2002-09-30 Gavin Romig-Koch <gavin@redhat.com> Ken Raeburn <raeburn@cygnus.com> Aldy Hernandez <aldyh@redhat.com> diff --git a/include/opcode/cgen.h b/include/opcode/cgen.h index 09c5cbf03..89477985e 100644 --- a/include/opcode/cgen.h +++ b/include/opcode/cgen.h @@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., Perhaps the definition of bfd_vma can be moved outside of bfd.h. Or perhaps one could duplicate its definition in another file. Until such time, this file conditionally compiles definitions that require - bfd_vma using BFD_VERSION_DATE. */ + bfd_vma using __BFD_H_SEEN__. */ /* Enums must be defined before they can be used. Allow them to be used in struct definitions, even though the enum must @@ -276,7 +276,7 @@ typedef const char * (cgen_parse_fn) PC is the pc value of the insn. The result is an error message or NULL if success. */ -#ifdef BFD_VERSION_DATE +#ifdef __BFD_H_SEEN__ typedef const char * (cgen_insert_fn) PARAMS ((CGEN_CPU_DESC, const CGEN_INSN *insn_, CGEN_FIELDS *fields_, CGEN_INSN_BYTES_PTR insnp_, @@ -297,7 +297,7 @@ typedef const char * (cgen_insert_fn) (); PC is the pc value of the insn. The result is the length of the insn in bits or zero if not recognized. */ -#ifdef BFD_VERSION_DATE +#ifdef __BFD_H_SEEN__ typedef int (cgen_extract_fn) PARAMS ((CGEN_CPU_DESC, const CGEN_INSN *insn_, CGEN_EXTRACT_INFO *ex_info_, CGEN_INSN_INT base_insn_, @@ -316,7 +316,7 @@ typedef int (cgen_extract_fn) (); PC is the pc value of the insn. LEN is the length of the insn, in bits. */ -#ifdef BFD_VERSION_DATE +#ifdef __BFD_H_SEEN__ typedef void (cgen_print_fn) PARAMS ((CGEN_CPU_DESC, PTR info_, const CGEN_INSN *insn_, CGEN_FIELDS *fields_, bfd_vma pc_, int len_)); @@ -381,7 +381,7 @@ enum cgen_parse_operand_result CGEN_PARSE_OPERAND_RESULT_ERROR }; -#ifdef BFD_VERSION_DATE /* Don't require bfd.h unnecessarily. */ +#ifdef __BFD_H_SEEN__ /* Don't require bfd.h unnecessarily. */ typedef const char * (cgen_parse_operand_fn) PARAMS ((CGEN_CPU_DESC, enum cgen_parse_operand_type, const char **, int, int, @@ -565,7 +565,7 @@ const CGEN_KEYWORD_ENTRY *cgen_keyword_search_next extern const char *cgen_parse_keyword PARAMS ((CGEN_CPU_DESC, const char **, CGEN_KEYWORD *, long *)); -#ifdef BFD_VERSION_DATE /* Don't require bfd.h unnecessarily. */ +#ifdef __BFD_H_SEEN__ /* Don't require bfd.h unnecessarily. */ extern const char *cgen_parse_signed_integer PARAMS ((CGEN_CPU_DESC, const char **, int, long *)); extern const char *cgen_parse_unsigned_integer @@ -1253,7 +1253,7 @@ typedef struct cgen_cpu_desc const char * (*parse_operand) PARAMS ((CGEN_CPU_DESC, int opindex_, const char **, CGEN_FIELDS *fields_)); -#ifdef BFD_VERSION_DATE +#ifdef __BFD_H_SEEN__ const char * (*insert_operand) PARAMS ((CGEN_CPU_DESC, int opindex_, CGEN_FIELDS *fields_, CGEN_INSN_BYTES_PTR, bfd_vma pc_)); @@ -1286,7 +1286,7 @@ typedef struct cgen_cpu_desc PARAMS ((CGEN_CPU_DESC, int opindex_, const CGEN_FIELDS *fields_)); void (*set_int_operand) PARAMS ((CGEN_CPU_DESC, int opindex_, CGEN_FIELDS *fields_, int value_)); -#ifdef BFD_VERSION_DATE +#ifdef __BFD_H_SEEN__ bfd_vma (*get_vma_operand) PARAMS ((CGEN_CPU_DESC, int opindex_, const CGEN_FIELDS *fields_)); void (*set_vma_operand) diff --git a/include/opcode/tic4x.h b/include/opcode/tic4x.h index 68d186d1d..18df7f19c 100644 --- a/include/opcode/tic4x.h +++ b/include/opcode/tic4x.h @@ -304,8 +304,10 @@ static const c4x_inst_t c3x_insts[] = { "addi_mpyi", 0x89000000, 0xff000000, Q_rSr_rSr }, { "addi_mpyi", 0x8a000000, 0xff000000, Q_SSr_rrr }, { "addi_mpyi", 0x8b000000, 0xff000000, Q_Srr_Srr }, + { "addi_mpyi", 0x8b000000, 0xff000000, Q_Srr_rSr }, { "addi3_mpyi3", 0x88000000, 0xff000000, Q_rrr_SSr }, { "addi3_mpyi3", 0x89000000, 0xff000000, Q_rSr_Srr }, + { "addi3_mpyi3", 0x89000000, 0xff000000, Q_rSr_rSr }, { "addi3_mpyi3", 0x8a000000, 0xff000000, Q_SSr_rrr }, { "addi3_mpyi3", 0x8b000000, 0xff000000, Q_Srr_Srr }, { "addi3_mpyi3", 0x8b000000, 0xff000000, Q_Srr_rSr }, @@ -390,6 +392,8 @@ static const c4x_inst_t c3x_insts[] = { "negf_stf", 0xe2000000, 0xfe000000, P_Sr_rS }, { "negi_sti", 0xe4000000, 0xfe000000, P_Sr_rS }, { "not_sti", 0xe6000000, 0xfe000000, P_Sr_rS }, + { "or_sti", 0xe8000000, 0xfe000000, P_Srr_rS }, + { "or_sti", 0xe8000000, 0xfe000000, P_rSr_rS }, { "or3_sti", 0xe8000000, 0xfe000000, P_Srr_rS }, { "or3_sti", 0xe8000000, 0xfe000000, P_rSr_rS }, { "stf_absf", 0xc8000000, 0xfe000000, Q_rS_Sr }, @@ -402,6 +406,7 @@ static const c4x_inst_t c3x_insts[] = { "stf_mpyf", 0xde000000, 0xfe000000, Q_rS_rSr }, { "stf_mpyf3", 0xde000000, 0xfe000000, Q_rS_Srr }, { "stf_mpyf3", 0xde000000, 0xfe000000, Q_rS_rSr }, + { "stf_ldf", 0xd8000000, 0xfe000000, Q_rS_Sr }, { "stf_negf", 0xe2000000, 0xfe000000, Q_rS_Sr }, { "stf_stf", 0xc0000000, 0xfe000000, P_rS_rS }, { "stf1_stf2", 0xc0000000, 0xfe000000, Q_rS_rS }, /* synonym */ @@ -417,6 +422,7 @@ static const c4x_inst_t c3x_insts[] = { "sti_and", 0xd0000000, 0xfe000000, Q_rS_rSr }, { "sti_and3", 0xd0000000, 0xfe000000, Q_rS_Srr }, { "sti_and3", 0xd0000000, 0xfe000000, Q_rS_rSr }, + { "sti_ash", 0xd2000000, 0xfe000000, Q_rS_rSr }, { "sti_ash3", 0xd2000000, 0xfe000000, Q_rS_rSr }, { "sti_fix", 0xd4000000, 0xfe000000, Q_rS_Sr }, { "sti_ldi", 0xda000000, 0xfe000000, Q_rS_Sr }, @@ -1007,9 +1013,9 @@ static const c4x_inst_t c3x_insts[] = { "xor3", 0x38000000, 0xffe00000, T_rJr }, /* C4x */ { "xor3", 0x38200000, 0xffe00000, T_rRr }, /* C4x */ { "xor3", 0x38200000, 0xffe00000, T_Rrr }, /* C4x */ - { "xor3", 0x3c400000, 0xffe00000, T_JRr }, /* C4x */ - { "xor3", 0x3c400000, 0xffe00000, T_RJr }, /* C4x */ - { "xor3", 0x3c600000, 0xffe00000, T_RRr }, /* C4x */ + { "xor3", 0x38400000, 0xffe00000, T_JRr }, /* C4x */ + { "xor3", 0x38400000, 0xffe00000, T_RJr }, /* C4x */ + { "xor3", 0x38600000, 0xffe00000, T_RRr }, /* C4x */ /* Dummy entry, not included in c3x_num_insts. This lets code examine entry i + 1 without checking @@ -1025,6 +1031,8 @@ static const c4x_inst_t c4x_insts[] = /* Parallel instructions. */ { "frieee_stf", 0xf2000000, 0xfe000000, P_Sr_rS }, { "toieee_stf", 0xf0000000, 0xfe000000, P_Sr_rS }, + { "stf_frieee", 0xf2000000, 0xfe000000, Q_rS_Sr }, + { "stf_toieee", 0xf0000000, 0xfe000000, Q_rS_Sr }, { "bBaf", 0x68a00000, 0xffe00000, "Q" }, { "bBaf", 0x6aa00000, 0xffe00000, "P" }, @@ -1038,12 +1046,10 @@ static const c4x_inst_t c4x_insts[] = { "lajB", 0x70200000, 0xffe00000, "Q" }, { "lajB", 0x72200000, 0xffe00000, "P" }, { "latB", 0x74800000, 0xffe00000, "V" }, - { "frieee", 0x1c000000, 0xffe00000, G_r_r }, { "frieee", 0x1c200000, 0xffe00000, G_T_r }, { "frieee", 0x1c400000, 0xffe00000, G_Q_r }, { "frieee", 0x1c600000, 0xffe00000, G_F_r }, - { "lb0", 0xb0000000, 0xffe00000, G_r_r }, { "lb0", 0xb0200000, 0xffe00000, G_T_r }, { "lb0", 0xb0400000, 0xffe00000, G_Q_r }, diff --git a/include/partition.h b/include/partition.h index 885a79b4b..5d3623f71 100644 --- a/include/partition.h +++ b/include/partition.h @@ -78,4 +78,8 @@ extern void partition_print PARAMS((partition, #define partition_find(partition__, element__) \ ((partition__)->elements[(element__)].class_element) +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* _PARTITION_H */ |