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
1=== modified file 'Makefile.am'
2--- Makefile.am 2010-09-13 08:30:44 +0000
3+++ Makefile.am 2011-03-10 17:57:32 +0000
4@@ -108,26 +108,19 @@
5
6 # Flags for the benchmark helpers
7 try_none_SOURCES =
8-try_none_LDFLAGS = -lrt
9-try_none_LDADD = libmulti.a
10+try_none_LDADD = libmulti.a -lrt
11 try_all_SOURCES =
12-try_all_LDFLAGS = -lrt
13-try_all_LDADD = libmulti.a libcortex-strings.la
14+try_all_LDADD = libmulti.a libcortex-strings.la -lrt
15 try_bionic_SOURCES =
16-try_bionic_LDFLAGS = -lrt
17-try_bionic_LDADD = libmulti.a libbionic.a
18+try_bionic_LDADD = libmulti.a libbionic.a -lrt
19 try_csl_SOURCES =
20-try_csl_LDFLAGS = -lrt
21-try_csl_LDADD = libmulti.a libcsl.a
22+try_csl_LDADD = libmulti.a libcsl.a -lrt
23 try_glibc_SOURCES =
24-try_glibc_LDFLAGS = -lrt
25-try_glibc_LDADD = libmulti.a libglibc.a
26+try_glibc_LDADD = libmulti.a libglibc.a -lrt
27 try_newlib_SOURCES =
28-try_newlib_LDFLAGS = -lrt
29-try_newlib_LDADD = libmulti.a libnewlib.a
30+try_newlib_LDADD = libmulti.a libnewlib.a -lrt
31 try_plain_SOURCES =
32-try_plain_LDFLAGS = -lrt
33-try_plain_LDADD = libmulti.a libplain.a
34+try_plain_LDADD = libmulti.a libplain.a -lrt
35
36 # Good 'ol Dhrystone
37 dhry_SOURCES = \
38@@ -142,7 +135,7 @@
39 dhry_native_CFLAGS = $(dhry_CFLAGS)
40
41 AM_CPPFLAGS = $(neon_cppflags)
42-AM_CFLAGS = -std=gnu99 -Wall $(AM_CPPFLAGS)
43+AM_CFLAGS = -std=gnu99 -Wall -Wa,-mimplicit-it=thumb $(AM_CPPFLAGS)
44
45 EXTRA_DIST = \
46 tests/hp-timing.h \

Subscribers

People subscribed via source and target branches