From 45c4533cc159996c5d672e696beb6f8fb5d4c7ef Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Wed, 5 Feb 2014 10:57:24 +0200 Subject: [PATCH] ads2gas_apple.pl: Reduce differences to ads2gas.pl Avoid substitution of substrings by using \b to make sure the substituted strings are at word boundaries. This is an adaption of the corresponding changes to ads2gas.pl from 7ebcaeb0fa. Change-Id: I52160e8ba0373d4779d5fc3b0c384ca5c51c7b13 --- build/make/ads2gas_apple.pl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/make/ads2gas_apple.pl b/build/make/ads2gas_apple.pl index befb3dbe7..a82f3eba8 100755 --- a/build/make/ads2gas_apple.pl +++ b/build/make/ads2gas_apple.pl @@ -75,16 +75,16 @@ while () s/:SHR:/ >> /g; # Convert ELSE to .else - s/ELSE/.else/g; + s/\bELSE\b/.else/g; # Convert ENDIF to .endif - s/ENDIF/.endif/g; + s/\bENDIF\b/.endif/g; # Convert ELSEIF to .elseif - s/ELSEIF/.elseif/g; + s/\bELSEIF\b/.elseif/g; # Convert LTORG to .ltorg - s/LTORG/.ltorg/g; + s/\bLTORG\b/.ltorg/g; # Convert IF :DEF:to .if # gcc doesn't have the ability to do a conditional @@ -164,7 +164,7 @@ while () s/^([a-zA-Z_0-9\$]+)/$1:/ if !/EQU/; # ALIGN directive - s/ALIGN/.balign/g; + s/\bALIGN\b/.balign/g; # Strip ARM s/\sARM/@ ARM/g; @@ -184,7 +184,7 @@ while () s/(.*)EQU(.*)/.set $1, $2/; # Begin macro definition - if (/MACRO/) + if (/\bMACRO\b/) { # Process next line down, which will be the macro definition $_ = ; @@ -215,7 +215,7 @@ while () # For macros, use \ to reference formal params # s/\$/\\/g; # End macro definition - s/MEND/.endm/; # No need to tell it where to stop assembling + s/\bMEND\b/.endm/; # No need to tell it where to stop assembling next if /^\s*END\s*$/; # Clang used by Chromium differs slightly from clang in XCode in what it -- 2.40.0