diff options
| author | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-01 18:24:08 +0000 |
|---|---|---|
| committer | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-01 18:24:08 +0000 |
| commit | 1ab8a92425501c81153cb2a78dab40e537a97844 (patch) | |
| tree | 1e7c6e2efd378397495290fea96cd8e90fdbb84b | |
| parent | 4486e02873fa383e0399cfce597ed041847fcabd (diff) | |
| download | gcc-1ab8a92425501c81153cb2a78dab40e537a97844.tar.gz | |
* Makefile.in (c-options.c, c-options.h): Parallel make safe.
* c.opt: End in blank line.
* opts.sh: Take AWK from environment if available; use C locale.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67305 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/Makefile.in | 5 | ||||
| -rw-r--r-- | gcc/c.opt | 2 | ||||
| -rw-r--r-- | gcc/opts.sh | 12 |
4 files changed, 22 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b254385758c..dc83f5c7dbf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-06-01 Neil Booth <neil@daikokuya.co.uk> + + * Makefile.in (c-options.c, c-options.h): Parallel make safe. + * c.opt: End in blank line. + * opts.sh: Take AWK from environment if available; use C locale. + 2003-06-01 Andreas Schwab <schwab@suse.de> * config/m68k/linux.h: Remove code protected by USE_GNULIBC_1. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index fb9c7886c2c..e1c18d3af0d 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1320,9 +1320,12 @@ c-opts.o : c-opts.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ $< $(OUTPUT_OPTION) @TARGET_SYSTEM_ROOT_DEFINE@ -c-options.h c-options.c: c.opt $(srcdir)/opts.sh +c-options.c: c.opt $(srcdir)/opts.sh $(SHELL) $(srcdir)/opts.sh c-options.c c-options.h $(srcdir)/c.opt +c-options.h: c-options.c + @true + c-cppbuiltin.o : c-cppbuiltin.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) $(C_COMMON_H) c-pragma.h flags.h toplev.h langhooks.h \ output.h except.h real.h $(TM_P_H) diff --git a/gcc/c.opt b/gcc/c.opt index b39f87f4d47..c09104ee81a 100644 --- a/gcc/c.opt +++ b/gcc/c.opt @@ -598,3 +598,5 @@ C ObjC C++ ObjC++ w C ObjC C++ ObjC++ + +; This comment is to ensure we retain the blank line above. diff --git a/gcc/opts.sh b/gcc/opts.sh index 182f79667d2..9a4df53c696 100644 --- a/gcc/opts.sh +++ b/gcc/opts.sh @@ -19,7 +19,15 @@ # # Usage: opts.sh outfile.c outfile.h file1.opt [file2.opt, ...] -AWK=/usr/bin/awk +# Always operate in the C locale. +LANG=C +LANGUAGE=C +LC_ALL=C +export LANG LANGUAGE LC_ALL + +# Set AWK if environment has not already set it. +AWK=${AWK-awk} + SORT=sort # Could be /bin/sort or /usr/bin/sort C_FILE=$1; shift @@ -30,7 +38,7 @@ cat "$@" | ${AWK} ' # Ignore comments and blank lines /^[ \t]*(;|$)/ { next } /^[^ \t]/ { gsub ("\n", "\034", $0); print } -' | LANG=C ${SORT} | ${AWK} ' +' | ${SORT} | ${AWK} ' function switch_flags (langs, flags) { langs = ":" langs ":" |