diff options
| -rw-r--r-- | tools/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rw-r--r-- | tools/gccas/Makefile | 28 | ||||
| -rw-r--r-- | tools/gccas/gccas.sh | 64 | ||||
| -rw-r--r-- | tools/gccld/Makefile | 29 | ||||
| -rw-r--r-- | tools/gccld/gccld.sh | 23 |
6 files changed, 1 insertions, 148 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 51eb725616..a253b33ecc 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -26,9 +26,6 @@ add_subdirectory(llvm-prof) add_subdirectory(llvm-link) add_subdirectory(lli) -# gccas and gccld are deprecated: -# add_subdirectory(gccas) -# add_subdirectory(gccld) add_subdirectory(llvm-extract) add_subdirectory(llvm-db) diff --git a/tools/Makefile b/tools/Makefile index a54aeaf376..caf8b2f22b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -19,7 +19,7 @@ DIRS := llvm-config PARALLEL_DIRS := opt llvm-as llvm-dis \ llc llvm-ranlib llvm-ar llvm-nm \ llvm-ld llvm-prof llvm-link \ - lli gccas gccld llvm-extract llvm-db \ + lli llvm-extract llvm-db \ bugpoint llvm-bcanalyzer llvm-stub \ llvm-mc llvmc diff --git a/tools/gccas/Makefile b/tools/gccas/Makefile deleted file mode 100644 index ff84d96779..0000000000 --- a/tools/gccas/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -##===- tools/gccas/Makefile --------------------------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## -LEVEL = ../.. - -include $(LEVEL)/Makefile.common - -install-local:: $(PROJ_bindir)/gccas - -$(PROJ_bindir)/gccas : gccas.sh Makefile - $(Echo) Installing gccas shell script. - $(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@ - $(Verb) chmod 0755 $@ - -all-local:: $(ToolDir)/gccas - -$(ToolDir)/gccas : gccas.sh Makefile - $(Echo) Making $(ToolDir)/gccas shell script. - $(Verb) sed "s#@TOOLDIR@#$(ToolDir)#" $< > $@ - $(Verb) chmod 0755 $@ - -clean-local:: - $(Verb)$(RM) -f $(ToolDir)/gccas diff --git a/tools/gccas/gccas.sh b/tools/gccas/gccas.sh deleted file mode 100644 index 9cacad4b67..0000000000 --- a/tools/gccas/gccas.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -##===- tools/gccas.sh ------------------------------------------*- bash -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## -# -# Synopsis: This shell script is a replacement for the old "gccas" tool that -# existed in LLVM versions before 2.0. The functionality of gccas has -# now been moved to opt and llvm-as. This shell script provides -# backwards compatibility so build environments invoking gccas can -# still get the net effect of llvm-as/opt by running gccas. -# -# Syntax: gccas OPTIONS... [asm file] -# -##===----------------------------------------------------------------------===## -# -echo "gccas: This tool is deprecated, please use opt" 1>&2 -TOOLDIR=@TOOLDIR@ -OPTOPTS="-std-compile-opts -f" -ASOPTS="" -lastwasdasho=0 -for option in "$@" ; do - option=`echo "$option" | sed 's/^--/-/'` - case "$option" in - -disable-opt) - OPTOPTS="$OPTOPTS $option" - ;; - -disable-inlining) - OPTOPTS="$OPTOPTS $option" - ;; - -verify) - OPTOPTS="$OPTOPTS -verify-each" - ;; - -strip-debug) - OPTOPTS="$OPTOPTS $option" - ;; - -o) - OPTOPTS="$OPTOPTS -o" - lastwasdasho=1 - ;; - -disable-compression) - # ignore - ;; - -traditional-format) - # ignore - ;; - -*) - OPTOPTS="$OPTOPTS $option" - ;; - *) - if test $lastwasdasho -eq 1 ; then - OPTOPTS="$OPTOPTS $option" - lastwasdasho=0 - else - ASOPTS="$ASOPTS $option" - fi - ;; - esac -done -${TOOLDIR}/llvm-as $ASOPTS -o - | ${TOOLDIR}/opt $OPTOPTS diff --git a/tools/gccld/Makefile b/tools/gccld/Makefile deleted file mode 100644 index b2d3f73435..0000000000 --- a/tools/gccld/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -##===- tools/gccld/Makefile --------------------------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LEVEL = ../.. - -include $(LEVEL)/Makefile.common - -install-local:: $(PROJ_bindir)/gccld - -$(PROJ_bindir)/gccld : gccld.sh Makefile - $(Echo) Installing gccld shell script. - $(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@ - $(Verb) chmod 0755 $@ - -all-local:: $(ToolDir)/gccld - -$(ToolDir)/gccld : gccld.sh Makefile - $(Echo) Making $(ToolDir)/gccld shell script. - $(Verb) sed "s#@TOOLDIR@#$(ToolDir)#" $< > $@ - $(Verb) chmod 0755 $@ - -clean-local:: - $(Verb)$(RM) -f $(ToolDir)/gccld diff --git a/tools/gccld/gccld.sh b/tools/gccld/gccld.sh deleted file mode 100644 index b092607c72..0000000000 --- a/tools/gccld/gccld.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -##===- tools/gccld/gccld.sh ------------------------------------*- bash -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## -# -# Synopsis: This shell script is a replacement for the old "gccld" tool that -# existed in LLVM versions before 2.0. The functionality of gccld has -# now been moved to llvm-ld. This shell script provides backwards -# compatibility so build environments invoking gccld can still get -# link (under the covers) with llvm-ld. -# -# Syntax: gccld OPTIONS... (see llvm-ld for details) -# -##===----------------------------------------------------------------------===## -# -echo "gccld: This tool is deprecated, please use llvm-ld" 1>&2 -TOOLDIR=@TOOLDIR@ -$TOOLDIR/llvm-ld "$@" |