This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[gccgo] Change configure variable from GCCGO to GOC
- From: Ian Lance Taylor <iant at google dot com>
- To: gcc-patches at gcc dot gnu dot org, gofrontend-dev at googlegroups dot com
- Date: Wed, 03 Nov 2010 13:04:35 -0700
- Subject: [gccgo] Change configure variable from GCCGO to GOC
I've been using GCCGO as the name of the shell/make variable for the Go
compiler, analogous to CC, CXX, GCJ, etc. Ralf Wildenhues and Eric
Blake suggested that I use GOC instead. These two patches implement
that change. Committed to gccgo branch.
Ian
Index: configure.ac
===================================================================
--- configure.ac (revision 166266)
+++ configure.ac (working copy)
@@ -3334,7 +3334,7 @@ NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TA
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(GCCGO_FOR_TARGET, gccgo)
+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)
@@ -3365,7 +3365,7 @@ 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, GCCGO_FOR_TARGET, GCCGO,
+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)
Index: Makefile.tpl
===================================================================
--- Makefile.tpl (revision 166266)
+++ Makefile.tpl (working copy)
@@ -160,8 +160,8 @@ BUILD_EXPORTS = \
CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
- GCCGO="$(GCCGO_FOR_BUILD)"; export GCCGO; \
- GOFLAGS="$(GOFLAGS_FOR_BUILD)"; export GOFLAGS; \
+ 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; \
@@ -279,7 +279,7 @@ BASE_TARGET_EXPORTS = \
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; \
- GCCGO="$(GCCGO_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GCCGO; \
+ 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; \
@@ -408,7 +408,7 @@ LDFLAGS = @LDFLAGS@
LIBCFLAGS = $(CFLAGS)
CXXFLAGS = @CXXFLAGS@
LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
-GOFLAGS = $(CFLAGS)
+GOCFLAGS = $(CFLAGS)
TFLAGS =
@@ -474,7 +474,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_
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@
-GCCGO_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCCGO_FOR_TARGET@
+GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
LD_FOR_TARGET=@LD_FOR_TARGET@
@@ -496,7 +496,7 @@ CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARG
LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
LDFLAGS_FOR_TARGET =
-GOFLAGS_FOR_TARGET = -O2 -g
+GOCFLAGS_FOR_TARGET = -O2 -g
FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
@@ -622,8 +622,8 @@ EXTRA_TARGET_FLAGS = \
'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
- 'GCCGO=$$(GCCGO_FOR_TARGET)' \
- 'GOFLAGS=$$(GOFLAGS_FOR_TARGET)' \
+ 'GOC=$$(GOC_FOR_TARGET)' \
+ 'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \
'LD=$(COMPILER_LD_FOR_TARGET)' \
'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
Index: Makefile.def
===================================================================
--- Makefile.def (revision 166266)
+++ Makefile.def (working copy)
@@ -287,8 +287,8 @@ flags_to_pass = { flag= DLLTOOL_FOR_TARG
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= GCCGO_FOR_TARGET ; };
-flags_to_pass = { flag= GOFLAGS_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 ; };
Index: config-ml.in
===================================================================
--- config-ml.in (revision 166266)
+++ config-ml.in (working copy)
@@ -517,7 +517,7 @@ multi-do:
prefix="$(prefix)" \
exec_prefix="$(exec_prefix)" \
GCJFLAGS="$(GCJFLAGS) $${flags}" \
- GOFLAGS="$(GOFLAGS) $${flags}" \
+ GOCFLAGS="$(GOCFLAGS) $${flags}" \
CXXFLAGS="$(CXXFLAGS) $${flags}" \
LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
@@ -751,7 +751,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
break
fi
done
- ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags" GCCGO="${GCCGO_}$flags"'
+ 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' '
@@ -759,7 +759,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
F77_=$F77' '
GCJ_=$GCJ' '
GFORTRAN_=$GFORTRAN' '
- GCCGO_=$GCCGO' '
+ GOC_=$GOC '
else
# Create a regular expression that matches any string as long
# as ML_POPDIR.
@@ -824,15 +824,15 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
esac
done
- GCCGO_=
- for arg in ${GCCGO}; do
+ GOC_=
+ for arg in ${GOC}; do
case $arg in
-[BIL]"${ML_POPDIR}"/*)
- GCCGO_="${GCCGO_}"`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"`' ' ;;
+ 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}"/*)
- GCCGO_="${GCCGO_}"`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_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
*)
- GCCGO_="${GCCGO_}${arg} " ;;
+ GOC_="${GOC_}${arg} " ;;
esac
done
Index: libtool.m4
===================================================================
--- libtool.m4 (revision 166266)
+++ libtool.m4 (working copy)
@@ -7030,7 +7030,7 @@ _LT_LINKER_BOILERPLATE
lt_save_CC="$CC"
lt_save_GCC="$GCC"
GCC=yes
-CC=${GCCGO-"gccgo"}
+CC=${GOC-"gccgo"}
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_TAGVAR(LD, $1)="$LD"
@@ -7131,7 +7131,7 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
# LT_PROG_GO
# -----------
AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GCCGO, gccgo,)
+[AC_CHECK_TOOL(GOC, gccgo,)
])
# LT_PROG_RC
Index: config/go.m4
===================================================================
--- config/go.m4 (revision 166266)
+++ config/go.m4 (working copy)
@@ -9,8 +9,8 @@ dnl This version is probably autoconf 2.
AC_LANG_DEFINE([Go], [go], [GO], [],
[ac_ext=go
-ac_compile='$GCCGO -c $GOFLAGS conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
-ac_link='$GCCGO -o conftest$ac_exeext $GOFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&AS_MESSAGE_LOG_FD'
+ac_compile='$GOC -c $GOCFLAGS conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
+ac_link='$GOC -o conftest$ac_exeext $GOCFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&AS_MESSAGE_LOG_FD'
ac_compile_gnu=yes
])
@@ -60,23 +60,23 @@ func ulongval() ulong { return $2 }],
AC_DEFUN([AC_LANG_COMPILER(Go)],
[AC_REQUIRE([AC_PROG_GO])])
-AN_MAKEVAR([GCCGO], [AC_PROG_GO])
+AN_MAKEVAR([GOC], [AC_PROG_GO])
AN_PROGRAM([gccgo], [AC_PROG_GO])
AC_DEFUN([AC_PROG_GO],
[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GCCGO], [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+AC_ARG_VAR([GOC], [Go compiler command])dnl
+AC_ARG_VAR([GOCFLAGS], [Go compiler flags])dnl
_AC_ARG_VAR_LDFLAGS()dnl
m4_ifval([$1],
- [AC_CHECK_TOOLS(GCCGO, [$1])],
-[AC_CHECK_TOOL(GCCGO, gccgo)
-if test -z "$GCCGO"; then
+ [AC_CHECK_TOOLS(GOC, [$1])],
+[AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
if test -n "$ac_tool_prefix"; then
- AC_CHECK_PROG(GCCGO, [${ac_tool_prefix}gccgo], [$ac_tool_prefix}gccgo])
+ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [$ac_tool_prefix}gccgo])
fi
fi
-if test -z "$GCCGO"; then
- AC_CHECK_PROG(GCCGO, gccgo, gccgo, , , gccgo)
+if test -z "$GOC"; then
+ AC_CHECK_PROG(GOC, gccgo, gccgo, , , gccgo)
fi
])
@@ -87,6 +87,6 @@ ac_compiler=$[2]
_AC_DO_LIMIT([$ac_compiler --version >&AS_MESSAGE_LOG_FD])
m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
m4_expand_once([_AC_COMPILER_OBJEXT])[]dnl
-GOFLAGS="-g -O2"
+GOCFLAGS="-g -O2"
AC_LANG_POP(Go)dnl
])# AC_PROG_GO
Index: gcc/testsuite/go.test/go-test.exp
===================================================================
--- gcc/testsuite/go.test/go-test.exp (revision 166266)
+++ gcc/testsuite/go.test/go-test.exp (working copy)
@@ -37,7 +37,7 @@ load_lib go-torture.exp
# Implement errchk
proc errchk { test } {
global dg-do-what-default
- global DEFAULT_GOFLAGS
+ global DEFAULT_GOCFLAGS
set saved-dg-do-what-default ${dg-do-what-default}
set dg-do-what-default compile
@@ -72,14 +72,14 @@ proc errchk { test } {
}
close $fdin
close $fdout
- go-dg-runtest $filename "-fno-show-column $DEFAULT_GOFLAGS"
+ go-dg-runtest $filename "-fno-show-column $DEFAULT_GOCFLAGS"
file delete $filename
set dg-do-what-default ${saved-dg-do-what-default}
}
# This is an execution test which should fail.
proc go-execute-xfail { test } {
- global DEFAULT_GOFLAGS
+ global DEFAULT_GOCFLAGS
set filename [file tail $test]
set fdin [open $test r]
@@ -90,7 +90,7 @@ proc go-execute-xfail { test } {
}
close $fdin
close $fdout
- go-dg-runtest $filename "-w $DEFAULT_GOFLAGS"
+ go-dg-runtest $filename "-w $DEFAULT_GOCFLAGS"
file delete $filename
}
@@ -105,9 +105,9 @@ proc go-gc-tests { } {
global target_triplet
# If a testcase doesn't have special options, use these.
- global DEFAULT_GOFLAGS
- if ![info exists DEFAULT_GOFLAGS] {
- set DEFAULT_GOFLAGS " -pedantic-errors"
+ global DEFAULT_GOCFLAGS
+ if ![info exists DEFAULT_GOCFLAGS] {
+ set DEFAULT_GOCFLAGS " -pedantic-errors"
}
# Running all the torture options takes too long and, since the
@@ -224,7 +224,7 @@ proc go-gc-tests { } {
set hold_runtests $runtests
set runtests "go-test.exp"
set dg-do-what-default "link"
- dg-test -keep-output $test "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $test "-O" "-w $DEFAULT_GOCFLAGS"
set output_file "./[file rootname [file tail $test]].exe"
set base "[file rootname [file tail $test]]"
if [isnative] {
@@ -268,7 +268,7 @@ proc go-gc-tests { } {
$test_line] } {
# This is a vanilla compile and link test.
set dg-do-what-default "link"
- go-dg-runtest $test "-w $DEFAULT_GOFLAGS"
+ go-dg-runtest $test "-w $DEFAULT_GOCFLAGS"
} elseif { [string match "// \$G \$D/\$F.go" $test_line] \
|| [string match "// \$G \$D/\$F.go || echo BUG*" \
$test_line] \
@@ -278,7 +278,7 @@ proc go-gc-tests { } {
$test_line] } {
# This is a vanilla compile test.
set dg-do-what-default "assemble"
- go-dg-runtest $test "-w $DEFAULT_GOFLAGS"
+ go-dg-runtest $test "-w $DEFAULT_GOCFLAGS"
} elseif { [string match "// \$G \$D/\$F.go && echo BUG*" \
$test_line] \
|| $test_line == "// ! \$G \$D/\$F.go >/dev/null" \
@@ -289,7 +289,7 @@ proc go-gc-tests { } {
# This is a compile test which should fail.
set dg-do-what-default "assemble"
setup_xfail "*-*-*"
- go-dg-runtest $test "-w $DEFAULT_GOFLAGS"
+ go-dg-runtest $test "-w $DEFAULT_GOCFLAGS"
} elseif { [string match "// \$G \$D/\$F.go && \$L \$F.\$A && ! ./\$A.out" \
$test_line] \
|| [string match "// \$G \$D/\$F.go && \$L \$F.\$A && ! ./\$A.out || echo BUG: *" \
@@ -324,9 +324,9 @@ proc go-gc-tests { } {
set runtests "go-test.exp"
set dg-do-what-default "assemble"
regsub "\\.go$" $test ".dir/bug0.go" file1
- dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOCFLAGS"
regsub "\\.go$" $test ".dir/bug1.go" file2
- dg-test $file2 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test $file2 "-O" "-w $DEFAULT_GOCFLAGS"
file delete "[file rootname [file tail $file1]].o"
set runtests $hold_runtests
} elseif { [string match \
@@ -348,7 +348,7 @@ proc go-gc-tests { } {
set runtests "go-test.exp"
set dg-do-what-default "assemble"
regsub "\\.go$" $test ".dir/$name1" file1
- dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOCFLAGS"
regsub "\\.go$" $test ".dir/$name2" file2
errchk $file2
file delete "[file rootname [file tail $file1]].o"
@@ -360,10 +360,10 @@ proc go-gc-tests { } {
set runtests "go-test.exp"
set dg-do-what-default "assemble"
regsub "\\.go$" $test ".dir/bug0.go" file1
- dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOCFLAGS"
regsub "\\.go$" $test ".dir/bug1.go" file2
setup_xfail "*-*-*"
- dg-test $file2 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test $file2 "-O" "-w $DEFAULT_GOCFLAGS"
file delete "[file rootname [file tail $file1]].o"
set runtests $hold_runtests
} elseif { [string match \
@@ -373,12 +373,12 @@ proc go-gc-tests { } {
set runtests "go-test.exp"
set dg-do-what-default "assemble"
regsub "\\.go$" $test ".dir/bug0.go" file1
- dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOCFLAGS"
regsub "\\.go$" $test ".dir/bug1.go" file2
- dg-test -keep-output $file2 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file2 "-O" "-w $DEFAULT_GOCFLAGS"
regsub "\\.go$" $test ".dir/bug2.go" file3
setup_xfail "*-*-*"
- dg-test $file3 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test $file3 "-O" "-w $DEFAULT_GOCFLAGS"
file delete "[file rootname [file tail $file1]].o"
file delete "[file rootname [file tail $file2]].o"
set runtests $hold_runtests
@@ -389,9 +389,9 @@ proc go-gc-tests { } {
set runtests "go-test.exp"
set dg-do-what-default "assemble"
regsub "\\.go$" $test ".dir/bug0.go" file1
- dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOCFLAGS"
regsub "\\.go$" $test ".dir/bug1.go" file2
- dg-test -keep-output $file2 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file2 "-O" "-w $DEFAULT_GOCFLAGS"
regsub "\\.go$" $test ".dir/bug2.go" file3
errchk $file3
file delete "[file rootname [file tail $file1]].o"
@@ -404,15 +404,15 @@ proc go-gc-tests { } {
set runtests "go-test.exp"
set dg-do-what-default "assemble"
regsub "\\.go$" $test ".dir/x.go" file1
- dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOCFLAGS"
set ofile1 "[file rootname [file tail $file1]].o"
regsub "\\.go$" $test ".dir/y.go" file2
- dg-test -keep-output $file2 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file2 "-O" "-w $DEFAULT_GOCFLAGS"
set ofile2 "[file rootname [file tail $file2]].o"
set dg-do-what-default "link"
set output_file "./[file rootname [file tail $test]].exe"
set comp_output [go_target_compile "$ofile1 $ofile2" \
- $output_file "executable" "$DEFAULT_GOFLAGS"]
+ $output_file "executable" "$DEFAULT_GOCFLAGS"]
set comp_output [go-dg-prune $target_triplet $comp_output]
verbose -log $comp_output
set result [go_load "$output_file" "" ""]
@@ -427,17 +427,17 @@ proc go-gc-tests { } {
set runtests "go-test.exp"
set dg-do-what-default "assemble"
regsub "\\.go$" $test ".dir/a.go" file1
- dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOCFLAGS"
set ofile1 "[file rootname [file tail $file1]].o"
regsub "\\.go$" $test ".dir/b.go" file2
- dg-test -keep-output $file2 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file2 "-O" "-w $DEFAULT_GOCFLAGS"
set ofile2 "[file rootname [file tail $file2]].o"
- dg-test -keep-output "$test" "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output "$test" "-O" "-w $DEFAULT_GOCFLAGS"
set ofile3 "[file rootname [file tail $test]].o"
set dg-do-what-default "link"
set output_file "./[file rootname [file tail $test]].exe"
set comp_output [go_target_compile "$ofile1 $ofile2 $ofile3" \
- $output_file "executable" "$DEFAULT_GOFLAGS"]
+ $output_file "executable" "$DEFAULT_GOCFLAGS"]
set comp_output [go-dg-prune $target_triplet $comp_output]
if [string match "" $comp_output] {
pass $name
@@ -454,13 +454,13 @@ proc go-gc-tests { } {
set runtests "go-test.exp"
set dg-do-what-default "assemble"
regsub "/\[^/\]*$" $test "/embed0.go" file1
- dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOCFLAGS"
set ofile1 "[file rootname [file tail $file1]].o"
- dg-test -keep-output $test "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $test "-O" "-w $DEFAULT_GOCFLAGS"
set ofile2 "[file rootname [file tail $test]].o"
set output_file "./[file rootname [file tail $test]].exe"
set comp_output [go_target_compile "$ofile1 $ofile2" \
- $output_file "executable" "$DEFAULT_GOFLAGS"]
+ $output_file "executable" "$DEFAULT_GOCFLAGS"]
set comp_output [go-dg-prune $target_triplet $comp_output]
if [string match "" $comp_output] {
set result [go_load "$output_file" "" ""]
@@ -479,9 +479,9 @@ proc go-gc-tests { } {
set runtests "go-test.exp"
set dg-do-what-default "assemble"
regsub "\\.go$" $test ".dir/chanbug.go" file1
- dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOCFLAGS"
regsub "\\.go$" $test ".dir/chanbug2.go" file2
- dg-test $file2 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test $file2 "-O" "-w $DEFAULT_GOCFLAGS"
file delete "[file rootname [file tail $file1]].o"
set runtests $hold_runtests
} elseif { [string match \
@@ -489,7 +489,7 @@ proc go-gc-tests { } {
$test_line] } {
set dg-do-what-default "assemble"
setup_xfail "*-*-*"
- go-dg-runtest $test "-w $DEFAULT_GOFLAGS"
+ go-dg-runtest $test "-w $DEFAULT_GOCFLAGS"
} elseif { [string match \
"// \$G \$D/\$F.dir/x.go && errchk \$G \$D/\$F.dir/y.go" \
$test_line] } {
@@ -497,7 +497,7 @@ proc go-gc-tests { } {
set runtests "go-test.exp"
set dg-do-what-default "assemble"
regsub "\\.go$" $test ".dir/x.go" file1
- dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOCFLAGS"
regsub "\\.go$" $test ".dir/y.go" file2
errchk $file2
file delete "[file rootname [file tail $file1]].o"
@@ -514,19 +514,19 @@ proc go-gc-tests { } {
set runtests "go-test.exp"
set dg-do-what-default "assemble"
regsub "\\.go$" $test ".dir/bug0.go" file0
- dg-test -keep-output $file0 "-O -fgo-prefix=bug0" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file0 "-O -fgo-prefix=bug0" "-w $DEFAULT_GOCFLAGS"
set ofile0 "[file rootname [file tail $file0]].o"
regsub "\\.go$" $test ".dir/bug1.go" file1
- dg-test -keep-output $file1 "-O -fgo-prefix=bug1" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file1 "-O -fgo-prefix=bug1" "-w $DEFAULT_GOCFLAGS"
set ofile1 "[file rootname [file tail $file1]].o"
regsub "\\.go$" $test ".dir/bug2.go" file2
- dg-test -keep-output $file2 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file2 "-O" "-w $DEFAULT_GOCFLAGS"
set ofile2 "[file rootname [file tail $file2]].o"
regsub "\\.go$" $test ".dir/bug3.go" file3
errchk $file3
set output_file "./[file rootname [file tail $test]].exe"
set comp_output [go_target_compile "$ofile0 $ofile1 $ofile2" \
- $output_file "executable" "$DEFAULT_GOFLAGS"]
+ $output_file "executable" "$DEFAULT_GOCFLAGS"]
set comp-output [go-dg-prune $target_triplet $comp_output]
if [string match "" $comp_output] {
set result [go_load "$output_file" "" ""]
@@ -543,9 +543,9 @@ proc go-gc-tests { } {
set runtests "go-test.exp"
set dg-do-what-default "assemble"
regsub "/\[^/\]*$" $test "/import2.go" file1
- dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOCFLAGS"
set ofile1 "[file rootname [file tail $file1]].o"
- dg-test $test "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test $test "-O" "-w $DEFAULT_GOCFLAGS"
file delete $ofile1
set runtests $hold_runtests
} elseif { $test_line == "// \$G \$D/ddd2.go && \$G \$D/\$F.go && \$L \$F.\$A && ./\$A.out" } {
@@ -553,13 +553,13 @@ proc go-gc-tests { } {
set runtests "go-test.exp"
set dg-do-what-default "assemble"
regsub "/\[^/\]*$" $test "/ddd2.go" file1
- dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOCFLAGS"
set ofile1 "[file rootname [file tail $file1]].o"
- dg-test -keep-output $test "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $test "-O" "-w $DEFAULT_GOCFLAGS"
set ofile2 "[file rootname [file tail $test]].o"
set output_file "./[file rootname [file tail $test]].exe"
set comp_output [go_target_compile "$ofile1 $ofile2" \
- $output_file "executable" "$DEFAULT_GOFLAGS"]
+ $output_file "executable" "$DEFAULT_GOCFLAGS"]
set comp_output [go-dg-prune $target_triplet $comp_output]
if [string match "" $comp_output] {
set result [go_load "$output_file" "" ""]
@@ -575,7 +575,7 @@ proc go-gc-tests { } {
regsub "/\[^/\]*$" $test "/cmplxdivide1.go" test2
set output_file "./[file rootname [file tail $test]].o"
set comp_output [go_target_compile "$test $test2" \
- $output_file "executable" "$DEFAULT_GOFLAGS"]
+ $output_file "executable" "$DEFAULT_GOCFLAGS"]
set comp_output [go-dg-prune $target_triplet $comp_output]
if [string match "" $comp_output] {
set result [go_load "$output_file" "" ""]
@@ -594,7 +594,7 @@ proc go-gc-tests { } {
set hold_runtests $runtests
set runtests "go-test.exp"
set dg-do-what-default "link"
- dg-test -keep-output $test "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $test "-O" "-w $DEFAULT_GOCFLAGS"
set output_file "./[file rootname [file tail $test]].exe"
if [isnative] {
if { [catch "exec $output_file -pass 0 >tmp.go"] != 0 } {
@@ -626,7 +626,7 @@ proc go-gc-tests { } {
set hold_runtests $runtests
set runtests "go-test.exp"
set dg-do-what-default "link"
- dg-test -keep-output $test "-O" "-w $DEFAULT_GOFLAGS"
+ dg-test -keep-output $test "-O" "-w $DEFAULT_GOCFLAGS"
set output_file "./[file rootname [file tail $test]].exe"
if [isnative] {
if { [catch "exec $output_file >tmp.go"] != 0 } {
Index: gcc/testsuite/lib/go.exp
===================================================================
--- gcc/testsuite/lib/go.exp (revision 166266)
+++ gcc/testsuite/lib/go.exp (working copy)
@@ -22,7 +22,7 @@ load_lib gcc-defs.exp
load_lib target-libpath.exp
#
-# GO_UNDER_TEST is the compiler under test.
+# GOC_UNDER_TEST is the compiler under test.
#
@@ -34,12 +34,12 @@ set gpp_compile_options ""
#
proc go_version { } {
- global GO_UNDER_TEST
+ global GOC_UNDER_TEST
go_init
# ignore any arguments after the command
- set compiler [lindex $GO_UNDER_TEST 0]
+ set compiler [lindex $GOC_UNDER_TEST 0]
# verify that the compiler exists
if { [is_remote host] || [which $compiler] != 0 } then {
@@ -92,7 +92,7 @@ proc go_include_flags { paths } {
proc go_link_flags { paths } {
global srcdir
global ld_library_path
- global GO_UNDER_TEST
+ global GOC_UNDER_TEST
global shlib_ext
set gccpath ${paths}
@@ -115,7 +115,7 @@ proc go_link_flags { paths } {
append flags "-L${gccpath}/libiberty "
}
append ld_library_path \
- [gcc-set-multilib-library-path $GO_UNDER_TEST]
+ [gcc-set-multilib-library-path $GOC_UNDER_TEST]
}
set_ld_library_path_env_vars
@@ -135,30 +135,30 @@ proc go_init { args } {
global libdir
global gluefile wrap_flags
global objdir srcdir
- global ALWAYS_GOFLAGS
+ global ALWAYS_GOCFLAGS
global TOOL_EXECUTABLE TOOL_OPTIONS
- global GO_UNDER_TEST
+ global GOC_UNDER_TEST
global TESTING_IN_BUILD_TREE
# We set LC_ALL and LANG to C so that we get the same error messages as expected.
setenv LC_ALL C
setenv LANG C
- if ![info exists GO_UNDER_TEST] then {
+ if ![info exists GOC_UNDER_TEST] then {
if [info exists TOOL_EXECUTABLE] {
- set GO_UNDER_TEST $TOOL_EXECUTABLE
+ set GOC_UNDER_TEST $TOOL_EXECUTABLE
} else {
if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } {
- set GO_UNDER_TEST [transform gccgo]
+ set GOC_UNDER_TEST [transform gccgo]
} else {
- set GO_UNDER_TEST [findfile $base_dir/../../gccgo "$base_dir/../../gccgo -B$base_dir/../../" [findfile $base_dir/gccgo "$base_dir/gccgo -B$base_dir/" [transform gccgo]]]
+ set GOC_UNDER_TEST [findfile $base_dir/../../gccgo "$base_dir/../../gccgo -B$base_dir/../../" [findfile $base_dir/gccgo "$base_dir/gccgo -B$base_dir/" [transform gccgo]]]
}
}
}
if ![is_remote host] {
- if { [which $GO_UNDER_TEST] == 0 } then {
- perror "GO_UNDER_TEST ($GO_UNDER_TEST) does not exist"
+ if { [which $GOC_UNDER_TEST] == 0 } then {
+ perror "GOC_UNDER_TEST ($GOC_UNDER_TEST) does not exist"
exit 1
}
}
@@ -172,23 +172,23 @@ proc go_init { args } {
go_maybe_build_wrapper "${tmpdir}/go-testglue.o"
- set ALWAYS_GOFLAGS ""
+ set ALWAYS_GOCFLAGS ""
if ![is_remote host] {
if [info exists TOOL_OPTIONS] {
- lappend ALWAYS_GOFLAGS "additional_flags=[go_include_flags [get_multilibs ${TOOL_OPTIONS}] ]"
- lappend ALWAYS_GOFLAGS "ldflags=[go_link_flags [get_multilibs ${TOOL_OPTIONS}] ]"
+ lappend ALWAYS_GOCFLAGS "additional_flags=[go_include_flags [get_multilibs ${TOOL_OPTIONS}] ]"
+ lappend ALWAYS_GOCFLAGS "ldflags=[go_link_flags [get_multilibs ${TOOL_OPTIONS}] ]"
} else {
- lappend ALWAYS_GOFLAGS "additional_flags=[go_include_flags [get_multilibs] ]"
- lappend ALWAYS_GOFLAGS "ldflags=[go_link_flags [get_multilibs] ]"
+ lappend ALWAYS_GOCFLAGS "additional_flags=[go_include_flags [get_multilibs] ]"
+ lappend ALWAYS_GOCFLAGS "ldflags=[go_link_flags [get_multilibs] ]"
}
}
if [info exists TOOL_OPTIONS] {
- lappend ALWAYS_GOFLAGS "additional_flags=$TOOL_OPTIONS"
+ lappend ALWAYS_GOCFLAGS "additional_flags=$TOOL_OPTIONS"
}
- verbose -log "ALWAYS_GOFLAGS set to $ALWAYS_GOFLAGS"
+ verbose -log "ALWAYS_GOCFLAGS set to $ALWAYS_GOCFLAGS"
verbose "go is initialized" 3
}
@@ -200,17 +200,17 @@ proc go_init { args } {
proc go_target_compile { source dest type options } {
global tmpdir
global gluefile wrap_flags
- global ALWAYS_GOFLAGS
- global GO_UNDER_TEST
+ global ALWAYS_GOCFLAGS
+ global GOC_UNDER_TEST
if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } {
lappend options "libs=${gluefile}"
lappend options "ldflags=${wrap_flags}"
}
- lappend options "compiler=$GO_UNDER_TEST"
+ lappend options "compiler=$GOC_UNDER_TEST"
- set options [concat "$ALWAYS_GOFLAGS" $options]
+ set options [concat "$ALWAYS_GOCFLAGS" $options]
set options [dg-additional-files-options $options $source]
return [target_compile $source $dest $type $options]
}
Index: gcc/testsuite/go.dg/dg.exp
===================================================================
--- gcc/testsuite/go.dg/dg.exp (revision 166266)
+++ gcc/testsuite/go.dg/dg.exp (working copy)
@@ -20,9 +20,9 @@
load_lib go-dg.exp
# If a testcase doesn't have special options, use these.
-global DEFAULT_GOFLAGS
-if ![info exists DEFAULT_GOFLAGS] then {
- set DEFAULT_GOFLAGS " -pedantic-errors"
+global DEFAULT_GOCFLAGS
+if ![info exists DEFAULT_GOCFLAGS] then {
+ set DEFAULT_GOCFLAGS " -pedantic-errors"
}
# Initialize `dg'.
@@ -30,7 +30,7 @@ dg-init
# Main loop.
go-dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/*.go ] ] $DEFAULT_GOFLAGS
+ [glob -nocomplain $srcdir/$subdir/*.go ] ] $DEFAULT_GOCFLAGS
# All done.
dg-finish
diff -r 7c78c9ee57a4 libgo/Makefile.am
--- a/libgo/Makefile.am Wed Nov 03 11:05:33 2010 -0700
+++ b/libgo/Makefile.am Wed Nov 03 13:03:11 2010 -0700
@@ -56,9 +56,9 @@
"CXXFLAGS=$(CXXFLAGS)" \
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
- "GCCGO_FOR_TARGET=$(GCCGO_FOR_TARGET)" \
- "GCCGO=$(GCCGO)" \
- "GOFLAGS=$(GOFLAGS)" \
+ "GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \
+ "GOC=$(GOC)" \
+ "GOCFLAGS=$(GOCFLAGS)" \
"INSTALL=$(INSTALL)" \
"INSTALL_DATA=$(INSTALL_DATA)" \
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
@@ -1191,15 +1191,15 @@
LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
-GOFLAGS = $(CFLAGS)
-AM_GOFLAGS = $(STRINGOPS_FLAG)
-GOCOMPILE = $(GCCGO) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_GOFLAGS) $(GOFLAGS)
+GOCFLAGS = $(CFLAGS)
+AM_GOCFLAGS = $(STRINGOPS_FLAG)
+GOCOMPILE = $(GOC) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_GOCFLAGS) $(GOCFLAGS)
-LTGOCOMPILE = $(LIBTOOL) --tag GO --mode=compile $(GCCGO) $(INCLUDES) \
- $(AM_GOFLAGS) $(GOFLAGS)
+LTGOCOMPILE = $(LIBTOOL) --tag GO --mode=compile $(GOC) $(INCLUDES) \
+ $(AM_GOCFLAGS) $(GOCFLAGS)
-GOLINK = $(LIBTOOL) --tag GO --mode-link $(GCCGO) \
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_GOFLAGS) $(LTLDFLAGS) \
+GOLINK = $(LIBTOOL) --tag GO --mode-link $(GOC) \
+ $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_GOCFLAGS) $(LTLDFLAGS) \
-lpthread -o $@
# Build a package.
@@ -1224,7 +1224,7 @@
# Check a package.
CHECK = \
- @GC="$(GCCGO) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs -Wl,-R,`${PWD_COMMAND}`/.libs"; \
+ @GC="$(GOC) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs -Wl,-R,`${PWD_COMMAND}`/.libs"; \
export GC; \
RUNTESTFLAGS="$(RUNTESTFLAGS)"; \
export RUNTESTFLAGS; \