Merge lp:~davidgil-uk/cortex-strings/march-2011-buildissues into lp:cortex-strings

Proposed by Dr. David Alan Gilbert
Status: Merged
Merged at revision: 20
Proposed branch: lp:~davidgil-uk/cortex-strings/march-2011-buildissues
Merge into: lp:cortex-strings
Diff against target: 46 lines (+8/-15)
1 file modified
Makefile.am (+8/-15)
To merge this branch: bzr merge lp:~davidgil-uk/cortex-strings/march-2011-buildissues
Reviewer Review Type Date Requested Status
Michael Hope Pending
Review via email: mp+52892@code.launchpad.net

Description of the change

cortex-strings fails to build on Natty (as on my Panda board).
It hits two problems:
  1) That some of the Bionic code doesn't have IT instructions and it's getting built as Thumb; rather than changing the code in 3rd party tests it seems better to add implicit-it so we can pull in any 3rd party code to test.
  2) The linker is now fussy about library order and the -lrt was in the middle of the link line.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile.am'
--- Makefile.am 2010-09-13 08:30:44 +0000
+++ Makefile.am 2011-03-10 17:57:32 +0000
@@ -108,26 +108,19 @@
108108
109# Flags for the benchmark helpers109# Flags for the benchmark helpers
110try_none_SOURCES =110try_none_SOURCES =
111try_none_LDFLAGS = -lrt111try_none_LDADD = libmulti.a -lrt
112try_none_LDADD = libmulti.a
113try_all_SOURCES =112try_all_SOURCES =
114try_all_LDFLAGS = -lrt113try_all_LDADD = libmulti.a libcortex-strings.la -lrt
115try_all_LDADD = libmulti.a libcortex-strings.la
116try_bionic_SOURCES =114try_bionic_SOURCES =
117try_bionic_LDFLAGS = -lrt115try_bionic_LDADD = libmulti.a libbionic.a -lrt
118try_bionic_LDADD = libmulti.a libbionic.a
119try_csl_SOURCES =116try_csl_SOURCES =
120try_csl_LDFLAGS = -lrt117try_csl_LDADD = libmulti.a libcsl.a -lrt
121try_csl_LDADD = libmulti.a libcsl.a
122try_glibc_SOURCES =118try_glibc_SOURCES =
123try_glibc_LDFLAGS = -lrt119try_glibc_LDADD = libmulti.a libglibc.a -lrt
124try_glibc_LDADD = libmulti.a libglibc.a
125try_newlib_SOURCES =120try_newlib_SOURCES =
126try_newlib_LDFLAGS = -lrt121try_newlib_LDADD = libmulti.a libnewlib.a -lrt
127try_newlib_LDADD = libmulti.a libnewlib.a
128try_plain_SOURCES =122try_plain_SOURCES =
129try_plain_LDFLAGS = -lrt123try_plain_LDADD = libmulti.a libplain.a -lrt
130try_plain_LDADD = libmulti.a libplain.a
131124
132# Good 'ol Dhrystone125# Good 'ol Dhrystone
133dhry_SOURCES = \126dhry_SOURCES = \
@@ -142,7 +135,7 @@
142dhry_native_CFLAGS = $(dhry_CFLAGS)135dhry_native_CFLAGS = $(dhry_CFLAGS)
143136
144AM_CPPFLAGS = $(neon_cppflags)137AM_CPPFLAGS = $(neon_cppflags)
145AM_CFLAGS = -std=gnu99 -Wall $(AM_CPPFLAGS)138AM_CFLAGS = -std=gnu99 -Wall -Wa,-mimplicit-it=thumb $(AM_CPPFLAGS)
146139
147EXTRA_DIST = \140EXTRA_DIST = \
148 tests/hp-timing.h \141 tests/hp-timing.h \

Subscribers

People subscribed via source and target branches