Author: sewardj
Date: Wed Oct 5 06:22:11 2016
New Revision: 16013
Log:
Merge from trunk:
r15988 Use AM_LDFLAGS instead of LDFLAGS in exp-bbv/tests Makefiles.
Modified:
branches/VALGRIND_3_12_BRANCH/ (props changed)
branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/amd64-linux/Makefile.am
branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/arm-linux/Makefile.am
branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/ppc32-linux/Makefile.am
branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/x86-linux/Makefile.am
branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/x86/Makefile.am
Modified: branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/amd64-linux/Makefile.am
==============================================================================
--- branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/amd64-linux/Makefile.am (original)
+++ branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/amd64-linux/Makefile.am Wed Oct 5 06:22:11 2016
@@ -25,7 +25,7 @@
AM_CCASFLAGS += -ffreestanding
-LDFLAGS += -nostartfiles -nodefaultlibs
+AM_LDFLAGS = -nostartfiles -nodefaultlibs
clone_test_SOURCES = clone_test.S
complex_rep_SOURCES = complex_rep.S
Modified: branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/arm-linux/Makefile.am
==============================================================================
--- branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/arm-linux/Makefile.am (original)
+++ branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/arm-linux/Makefile.am Wed Oct 5 06:22:11 2016
@@ -16,7 +16,7 @@
AM_CCASFLAGS += -ffreestanding -Xassembler -I$(top_srcdir)/exp-bbv/tests
-LDFLAGS += -nostartfiles -nodefaultlibs
+AM_LDFLAGS = -nostartfiles -nodefaultlibs
ll_SOURCES = ll.S
million_SOURCES = million.S
Modified: branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/ppc32-linux/Makefile.am
==============================================================================
--- branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/ppc32-linux/Makefile.am (original)
+++ branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/ppc32-linux/Makefile.am Wed Oct 5 06:22:11 2016
@@ -16,7 +16,7 @@
AM_CCASFLAGS += -ffreestanding -m32 -Xassembler -I$(top_srcdir)/exp-bbv/tests
-LDFLAGS += -nostartfiles -nodefaultlibs -m32
+AM_LDFLAGS = -nostartfiles -nodefaultlibs -m32
ll_SOURCES = ll.S
million_SOURCES = million.S
Modified: branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/x86-linux/Makefile.am
==============================================================================
--- branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/x86-linux/Makefile.am (original)
+++ branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/x86-linux/Makefile.am Wed Oct 5 06:22:11 2016
@@ -16,7 +16,7 @@
AM_CCASFLAGS += -ffreestanding -Xassembler -I$(top_srcdir)/exp-bbv/tests
-LDFLAGS += @FLAG_M32@ -static -nostartfiles -nodefaultlibs
+AM_LDFLAGS = @FLAG_M32@ -static -nostartfiles -nodefaultlibs
clone_test_SOURCES = clone_test.S
ll_SOURCES = ll.S
Modified: branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/x86/Makefile.am
==============================================================================
--- branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/x86/Makefile.am (original)
+++ branches/VALGRIND_3_12_BRANCH/exp-bbv/tests/x86/Makefile.am Wed Oct 5 06:22:11 2016
@@ -18,7 +18,7 @@
AM_CCASFLAGS += -ffreestanding
-LDFLAGS += @FLAG_M32@ -static -nostartfiles -nodefaultlibs
+AM_LDFLAGS = @FLAG_M32@ -static -nostartfiles -nodefaultlibs
complex_rep_SOURCES = complex_rep.S
fldcw_check_SOURCES = fldcw_check.S
|