From: borutr Date: Tue, 26 Dec 2006 07:45:35 +0000 (+0000) Subject: * support/cpp2/Makefile.in: added dependency on options.h X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=035e7e773c288bdee3865d0439193e0d6c9b5c47;p=fw%2Fsdcc * support/cpp2/Makefile.in: added dependency on options.h * configure: regenerated * support/cpp2/sdcpp.opt, support/cpp2/move-if-change: svn:eol-style native git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4525 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- diff --git a/ChangeLog b/ChangeLog index 55e07d05..7e4e27e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-12-36 Borut Razem + + * support/cpp2/Makefile.in: added dependency on options.h + * configure: regenerated + * support/cpp2/sdcpp.opt, support/cpp2/move-if-change: svn:eol-style native + 2006-12-25 Borut Razem * SDCPP synchronized with GCC CPP release version 3.4.6, diff --git a/support/cpp2/Makefile.in b/support/cpp2/Makefile.in index cb51ab78..5a581264 100644 --- a/support/cpp2/Makefile.in +++ b/support/cpp2/Makefile.in @@ -222,7 +222,7 @@ LIBCPP_OBJS = c-ppoutput.o cppinit.o cpplib.o cpplex.o cppmacro.o cppexp.o cppfi line-map.o cpptrad.o cppcharset.o hashtab.o \ opts.o options.o diagnostic.o pretty-print.o c-incpath.o -LIBCPP_DEPS = cpplib.h cpphash.h hashtable.h intl.h $(OBSTACK_H) $(SYSTEM_H) +LIBCPP_DEPS = cpplib.h cpphash.h hashtable.h intl.h options.h $(OBSTACK_H) $(SYSTEM_H) # Most of the other archives built/used by this makefile are for # targets. This one is strictly for the host. @@ -240,8 +240,8 @@ $(TARGET): sdcpp.o sdcpp-opts.o $(MY_LIBIBERTY_BITS) libcpp.a $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ sdcpp.o sdcpp-opts.o \ $(MY_LIBIBERTY_BITS) libcpp.a $(LIBS) -sdcpp.o: sdcpp.c $(CONFIG_H) cpplib.h $(SYSTEM_H) -sdcpp-opts.o: sdcpp-opts.c $(CONFIG_H) $(LIBCPP_DEPS) +sdcpp.o: sdcpp.c $(CONFIG_H) cpplib.h $(SYSTEM_H) options.h +sdcpp-opts.o: sdcpp-opts.c $(CONFIG_H) $(LIBCPP_DEPS) options.h c-ppoutput.o: c-ppoutput.c $(CONFIG_H) cpplib.h intl.h $(SYSTEM_H) cppinit.o: cppinit.c $(CONFIG_H) $(LIBCPP_DEPS) cppdefault.h \ diff --git a/support/cpp2/configure b/support/cpp2/configure index 7897d5f5..e693f5b6 100755 --- a/support/cpp2/configure +++ b/support/cpp2/configure @@ -561,7 +561,7 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= -ac_unique_file="sdcppmain.c" +ac_unique_file="sdcpp.c" # Factoring default headers for most tests. ac_includes_default="\ #include diff --git a/support/cpp2/move-if-change b/support/cpp2/move-if-change index 28fcfbb7..66d8b8ad 100644 --- a/support/cpp2/move-if-change +++ b/support/cpp2/move-if-change @@ -1,17 +1,17 @@ -#!/bin/sh -# Like mv $1 $2, but if the files are the same, just delete $1. -# Status is 0 if $2 is changed, 1 otherwise. -if -test -r $2 -then -if -cmp -s $1 $2 -then -echo $2 is unchanged -rm -f $1 -else -mv -f $1 $2 -fi -else -mv -f $1 $2 -fi +#!/bin/sh +# Like mv $1 $2, but if the files are the same, just delete $1. +# Status is 0 if $2 is changed, 1 otherwise. +if +test -r $2 +then +if +cmp -s $1 $2 +then +echo $2 is unchanged +rm -f $1 +else +mv -f $1 $2 +fi +else +mv -f $1 $2 +fi diff --git a/support/cpp2/sdcpp.opt b/support/cpp2/sdcpp.opt index d6fe7cf1..fe06f28a 100644 --- a/support/cpp2/sdcpp.opt +++ b/support/cpp2/sdcpp.opt @@ -1,344 +1,344 @@ -; Options for the SDCPP front end. -; Copyright (C) 2003 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 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, 59 Temple Place - Suite 330, Boston, MA -; 02111-1307, USA. - - -; This file is processed by the script opts.sh. It is a database of -; command line options, with each record separated by a blank line, -; and each field appearing on its own line. The first field is the -; command-line switch with the leading "-" removed. All options -; beginning with "f" or "W" are implicitly assumed to take a "no-" -; form; this form should not be listed. If you do not want this -; negative form and you want it to be automatically rejected, add -; RejectNegative to the second field. - -; The second field is a space-separated list of which parts of the -; compiler recognize the switch, as declared by "Language" entries. -; If the switch takes an argument, then you should also specify -; "Joined" and/or "Separate" to indicate where the argument can -; appear. If a Joined argument can legitimately be omitted, specify -; "JoinedOrMissing" instead of "Joined". If the argument to a switch -; is a non-negative integer, you can specify "UInteger" and the switch -; decoder will convert the argument for you, or complain to the user -; if the argument is invalid. - -; The third field is the help text to output with --help. This is -; automatically line-wrapped on output. Normally the switch is output -; automatically, with the help text on the right hand side of the -; output. However, if the help text contains a tab character, the -; text to the left of the tab is output instead of the switch, and the -; text to its right forms the help. This is useful for elaborating on -; what type of argument a switch takes, for example. If the second -; field contains "Undocumented" then nothing is output with --help. -; Only do this with good reason like the switch being internal between -; the driver and the front end - it is not an excuse to leave a switch -; undocumented. - -; Comments can appear on their own line anwhere in the file, preceded -; by a semicolon. Whitespace is permitted before the semicolon. - -; For each switch XXX below, an enumeration constant is created by the -; script opts.sh spelt OPT_XXX, but with all non-alphanumeric -; characters replaced with an underscore. - -; Please try to keep this file in ASCII collating order. - -Language -SDCPP - --help -Common -Display this information - --version -Common -Display the compiler's version - -;***-output-pch= -;***SDCPP Joined Separate - -A -SDCPP Joined Separate --A= Assert the to . Putting '-' before disables the to - -C -SDCPP -Do not discard comments - -CC -SDCPP -Do not discard comments in macro expansions - -D -SDCPP Joined Separate --D[=] Define a with as its value. If just is given, is taken to be 1 - -H -SDCPP -Print the name of header files as they are used - -I -SDCPP Joined Separate --I Add to the end of the main include path. -I- gives more include path control; see info documentation - -M -SDCPP -Generate make dependencies - -MD -SDCPP Separate -Generate make dependencies and compile - -MF -SDCPP Joined Separate --MF Write dependency output to the given file - -MG -SDCPP -Treat missing header files as generated files - -MM -SDCPP -Like -M but ignore system header files - -MMD -SDCPP Separate -Like -MD but ignore system header files - -MP -SDCPP -Generate phony targets for all headers - -MQ -SDCPP Joined Separate --MQ Add a MAKE-quoted target - -MT -SDCPP Joined Separate --MT Add an unquoted target - -P -SDCPP -Do not generate #line directives - -U -SDCPP Joined Separate --U Undefine - -Wall -SDCPP -Enable most warning messages - -Wcomment -SDCPP -Warn about possibly nested block comments, and C++ comments spanning more than one physical line - -Wcomments -SDCPP -Synonym for -Wcomment - -Wdeprecated -SDCPP -Warn about deprecated compiler features - -Wendif-labels -SDCPP -Warn about stray tokens after #elif and #endif - -Werror -SDCPP -Treat all warnings as errors - -Wimport -SDCPP -Deprecated. This switch has no effect. - -;***Winvalid-pch -;***SDCPP -;***Warn about PCH files that are found but not used - -Wsystem-headers -SDCPP -Do not suppress warnings from system headers - -Wtrigraphs -SDCPP -Warn if trigraphs are encountered that might affect the meaning of the program - -Wundef -SDCPP -Warn if an undefined macro is used in an #if directive - -Wunused-macros -SDCPP -Warn about macros defined in the main file that are not used - -ansi -SDCPP -A synonym for -std=c89. - -d -SDCPP Joined --d Enable dumps from specific passes of the compiler - -fdollars-in-identifiers -SDCPP -Permit '$' as an identifier character - -fexec-charset= -SDCPP Joined RejectNegative --fexec-charset= Convert all strings and character constants to character set - -finput-charset= -SDCPP Joined RejectNegative --finput-charset= Specify the default character set for source files. - -;***fpch-deps -;***SDCPP - -fpreprocessed -SDCPP -Treat the input file as already preprocessed - -fshow-column -SDCPP - -fsigned-char -SDCPP -Make \"char\" signed by default - -ftabstop= -SDCPP Joined RejectNegative UInteger --ftabstop= Distance between tab stops for column reporting - -funsigned-char -SDCPP -Make \"char\" unsigned by default - -fwide-exec-charset= -SDCPP Joined RejectNegative --fwide-exec-charset= Convert all wide strings and character constants to character set - -fworking-directory -SDCPP -Generate a #line directive pointing at the current working directory - -idirafter -SDCPP Joined Separate --idirafter Add to the end of the system include path - -imacros -SDCPP Joined Separate --imacros Accept definition of macros in - -include -SDCPP Joined Separate --include Include the contents of before other files - -iprefix -SDCPP Joined Separate --iprefix Specify as a prefix for next two options - -isysroot -SDCPP Joined Separate --isysroot Set to be the system root directory - -isystem -SDCPP Joined Separate --isystem Add to the start of the system include path - -iwithprefix -SDCPP Joined Separate --iwithprefix Add to the end of the system include path - -iwithprefixbefore -SDCPP Joined Separate --iwithprefixbefore Add to the end of the main include path - -lang-asm -C Undocumented - -lang-objc -SDCPP Undocumented - -nostdinc -SDCPP -Do not search standard system include directories (those specified with -isystem will still be used) - -o -SDCPP Joined Separate --o Place output into - -obj-ext= -SDCPP Joined --obj-ext= Define object file extension, used for generation of make dependencies - -pedantic -SDCPP -Issue warnings needed for strict compliance to the standard - -pedantic-errors -SDCPP -Like -pedantic but issue them as errors - -pedantic-parse-number -SDCPP -Pedantic parse number - -remap -SDCPP -Remap file names when including files - -std=c89 -SDCPP -Conform to the ISO 1990 C standard - -std=c99 -SDCPP -Conform to the ISO 1999 C standard - -std=iso9899:1990 -C ObjC -Conform to the ISO 1990 C standard - -std=iso9899:199409 -SDCPP -Conform to the ISO 1990 C standard as amended in 1994 - -std=iso9899:1999 -C ObjC -Conform to the ISO 1999 C standard - -traditional-cpp -SDCPP -Enable traditional preprocessing - -trigraphs -SDCPP --trigraphs Support ISO C trigraphs - -v -SDCPP -Enable verbose output - -w -SDCPP -Suppress warnings - -; This comment is to ensure we retain the blank line above. +; Options for the SDCPP front end. +; Copyright (C) 2003 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 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, 59 Temple Place - Suite 330, Boston, MA +; 02111-1307, USA. + + +; This file is processed by the script opts.sh. It is a database of +; command line options, with each record separated by a blank line, +; and each field appearing on its own line. The first field is the +; command-line switch with the leading "-" removed. All options +; beginning with "f" or "W" are implicitly assumed to take a "no-" +; form; this form should not be listed. If you do not want this +; negative form and you want it to be automatically rejected, add +; RejectNegative to the second field. + +; The second field is a space-separated list of which parts of the +; compiler recognize the switch, as declared by "Language" entries. +; If the switch takes an argument, then you should also specify +; "Joined" and/or "Separate" to indicate where the argument can +; appear. If a Joined argument can legitimately be omitted, specify +; "JoinedOrMissing" instead of "Joined". If the argument to a switch +; is a non-negative integer, you can specify "UInteger" and the switch +; decoder will convert the argument for you, or complain to the user +; if the argument is invalid. + +; The third field is the help text to output with --help. This is +; automatically line-wrapped on output. Normally the switch is output +; automatically, with the help text on the right hand side of the +; output. However, if the help text contains a tab character, the +; text to the left of the tab is output instead of the switch, and the +; text to its right forms the help. This is useful for elaborating on +; what type of argument a switch takes, for example. If the second +; field contains "Undocumented" then nothing is output with --help. +; Only do this with good reason like the switch being internal between +; the driver and the front end - it is not an excuse to leave a switch +; undocumented. + +; Comments can appear on their own line anwhere in the file, preceded +; by a semicolon. Whitespace is permitted before the semicolon. + +; For each switch XXX below, an enumeration constant is created by the +; script opts.sh spelt OPT_XXX, but with all non-alphanumeric +; characters replaced with an underscore. + +; Please try to keep this file in ASCII collating order. + +Language +SDCPP + +-help +Common +Display this information + +-version +Common +Display the compiler's version + +;***-output-pch= +;***SDCPP Joined Separate + +A +SDCPP Joined Separate +-A= Assert the to . Putting '-' before disables the to + +C +SDCPP +Do not discard comments + +CC +SDCPP +Do not discard comments in macro expansions + +D +SDCPP Joined Separate +-D[=] Define a with as its value. If just is given, is taken to be 1 + +H +SDCPP +Print the name of header files as they are used + +I +SDCPP Joined Separate +-I Add to the end of the main include path. -I- gives more include path control; see info documentation + +M +SDCPP +Generate make dependencies + +MD +SDCPP Separate +Generate make dependencies and compile + +MF +SDCPP Joined Separate +-MF Write dependency output to the given file + +MG +SDCPP +Treat missing header files as generated files + +MM +SDCPP +Like -M but ignore system header files + +MMD +SDCPP Separate +Like -MD but ignore system header files + +MP +SDCPP +Generate phony targets for all headers + +MQ +SDCPP Joined Separate +-MQ Add a MAKE-quoted target + +MT +SDCPP Joined Separate +-MT Add an unquoted target + +P +SDCPP +Do not generate #line directives + +U +SDCPP Joined Separate +-U Undefine + +Wall +SDCPP +Enable most warning messages + +Wcomment +SDCPP +Warn about possibly nested block comments, and C++ comments spanning more than one physical line + +Wcomments +SDCPP +Synonym for -Wcomment + +Wdeprecated +SDCPP +Warn about deprecated compiler features + +Wendif-labels +SDCPP +Warn about stray tokens after #elif and #endif + +Werror +SDCPP +Treat all warnings as errors + +Wimport +SDCPP +Deprecated. This switch has no effect. + +;***Winvalid-pch +;***SDCPP +;***Warn about PCH files that are found but not used + +Wsystem-headers +SDCPP +Do not suppress warnings from system headers + +Wtrigraphs +SDCPP +Warn if trigraphs are encountered that might affect the meaning of the program + +Wundef +SDCPP +Warn if an undefined macro is used in an #if directive + +Wunused-macros +SDCPP +Warn about macros defined in the main file that are not used + +ansi +SDCPP +A synonym for -std=c89. + +d +SDCPP Joined +-d Enable dumps from specific passes of the compiler + +fdollars-in-identifiers +SDCPP +Permit '$' as an identifier character + +fexec-charset= +SDCPP Joined RejectNegative +-fexec-charset= Convert all strings and character constants to character set + +finput-charset= +SDCPP Joined RejectNegative +-finput-charset= Specify the default character set for source files. + +;***fpch-deps +;***SDCPP + +fpreprocessed +SDCPP +Treat the input file as already preprocessed + +fshow-column +SDCPP + +fsigned-char +SDCPP +Make \"char\" signed by default + +ftabstop= +SDCPP Joined RejectNegative UInteger +-ftabstop= Distance between tab stops for column reporting + +funsigned-char +SDCPP +Make \"char\" unsigned by default + +fwide-exec-charset= +SDCPP Joined RejectNegative +-fwide-exec-charset= Convert all wide strings and character constants to character set + +fworking-directory +SDCPP +Generate a #line directive pointing at the current working directory + +idirafter +SDCPP Joined Separate +-idirafter Add to the end of the system include path + +imacros +SDCPP Joined Separate +-imacros Accept definition of macros in + +include +SDCPP Joined Separate +-include Include the contents of before other files + +iprefix +SDCPP Joined Separate +-iprefix Specify as a prefix for next two options + +isysroot +SDCPP Joined Separate +-isysroot Set to be the system root directory + +isystem +SDCPP Joined Separate +-isystem Add to the start of the system include path + +iwithprefix +SDCPP Joined Separate +-iwithprefix Add to the end of the system include path + +iwithprefixbefore +SDCPP Joined Separate +-iwithprefixbefore Add to the end of the main include path + +lang-asm +C Undocumented + +lang-objc +SDCPP Undocumented + +nostdinc +SDCPP +Do not search standard system include directories (those specified with -isystem will still be used) + +o +SDCPP Joined Separate +-o Place output into + +obj-ext= +SDCPP Joined +-obj-ext= Define object file extension, used for generation of make dependencies + +pedantic +SDCPP +Issue warnings needed for strict compliance to the standard + +pedantic-errors +SDCPP +Like -pedantic but issue them as errors + +pedantic-parse-number +SDCPP +Pedantic parse number + +remap +SDCPP +Remap file names when including files + +std=c89 +SDCPP +Conform to the ISO 1990 C standard + +std=c99 +SDCPP +Conform to the ISO 1999 C standard + +std=iso9899:1990 +C ObjC +Conform to the ISO 1990 C standard + +std=iso9899:199409 +SDCPP +Conform to the ISO 1990 C standard as amended in 1994 + +std=iso9899:1999 +C ObjC +Conform to the ISO 1999 C standard + +traditional-cpp +SDCPP +Enable traditional preprocessing + +trigraphs +SDCPP +-trigraphs Support ISO C trigraphs + +v +SDCPP +Enable verbose output + +w +SDCPP +Suppress warnings + +; This comment is to ensure we retain the blank line above.