History

configure: Handle armcc 5.0

The first line of the "armcc --vsn" output in one version is "Product: ARM Compiler 5.04".

Martin Storsjö committed 12 years ago

Commit 4936ef61 parent 32d05931 file · +4 −2Browse files

Unified · Split

configure+4−2
@@ -2766,10 +2766,10 @@ probe_cc(){ · 2765 unmodified lines
2766 _cflags_speed='-fast'2766 _cflags_speed='-fast'
2767 _cflags_size='-O1'2767 _cflags_size='-O1'
2768 _flags_filter=ccc_flags2768 _flags_filter=ccc_flags
2769 elif $_cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then2769 elif $_cc --vsn 2>/dev/null | grep -Eq "ARM (C/C\+\+ )?Compiler"; then
2770 test -d "$sysroot" || die "No valid sysroot specified."2770 test -d "$sysroot" || die "No valid sysroot specified."
2771 _type=armcc2771 _type=armcc
2772 _ident=$($_cc --vsn | head -n1)2772 _ident=$($_cc --vsn | head -n1 | sed 's/.*: //')
2773 armcc_conf="$PWD/armcc.conf"2773 armcc_conf="$PWD/armcc.conf"
2774 $_cc --arm_linux_configure \2774 $_cc --arm_linux_configure \
2775 --arm_linux_config_file="$armcc_conf" \2775 --arm_linux_config_file="$armcc_conf" \
@@ -4290,6 +4290,8 @@ elif enabled cparser; then · 1514 unmodified lines
4290 add_cflags -Wno-missing-variable-declarations4290 add_cflags -Wno-missing-variable-declarations
4291 add_cflags -Wno-empty-statement4291 add_cflags -Wno-empty-statement
4292elif enabled armcc; then4292elif enabled armcc; then
4293 add_cflags -W${armcc_opt},--diag_suppress=4343 # hardfp compat
4294 add_cflags -W${armcc_opt},--diag_suppress=3036 # using . as system include dir
4293 # 2523: use of inline assembler is deprecated4295 # 2523: use of inline assembler is deprecated
4294 add_cflags -W${armcc_opt},--diag_suppress=25234296 add_cflags -W${armcc_opt},--diag_suppress=2523
4295 add_cflags -W${armcc_opt},--diag_suppress=12074297 add_cflags -W${armcc_opt},--diag_suppress=1207

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t