drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
acadia-newlib/newlib/libc/machine
History
Corinna Vinschen e6d9af11f1 strlen-armv7.S: Fix preprocessor check 
Hi!

I've got the situation, that the function strlen() occurs twice in libc.a
(building newlib for ARM-V7a and Size-Optimized).

In newlib/libc/machine/arm/strlen.c there are the pre-processor stetements ...
#if defined (__OPTIMIZE_SIZE__) || defined (PREFER_SIZE_OVER_SPEED) || \
  (defined (__thumb__) && !defined (__thumb2__))
/*...*/
#else

#if !(defined(_ISA_ARM_7) || defined(__ARM_ARCH_6T2__))
/*...*/
#endif

and in newlib/libc/machine/arm/strlen-armv7.S the "exclude" begins with

/* NOTE: This ifdef MUST match the ones in arm/strlen.c
   We fallback to the one in arm/strlen.c for size optimised or
   for older architectures. */
#if defined(_ISA_ARM_7) || defined(__ARM_ARCH_6T2__) && \
    !(defined (__OPTIMIZE_SIZE__) || defined (PREFER_SIZE_OVER_SPEED) || \
      (defined (__thumb__) && !defined (__thumb2__)))

But this is not completely contrary to arm/strlen.c (see above)!

To fix the logical statement in arm/strlen-armv7.S there are parentheses needed

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
 		2015-08-27 12:55:22 +02:00
..
a29k 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
aarch64 [AArch64] Rewrite optimized memset. 2015-07-30 12:51:34 +01:00
arm strlen-armv7.S: Fix preprocessor check 2015-08-27 12:55:22 +02:00
bfin 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
cr16 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
cris 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
crx 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
d10v 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
d30v 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
epiphany 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
fr30 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
frv 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
h8300 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
h8500 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
hppa 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
i386 Complete action from 2001-12-18: 2015-01-23 10:16:00 +00:00
i960 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
iq2000 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
lm32 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
m32c 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
m32r 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
m68hc11 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
m68k 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
m88k 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
mep 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
microblaze 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
mips * libc/machine/mips/memset.S: Add support for mips32r6/mips64r6. 2015-03-03 19:49:00 +00:00
mn10200 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
mn10300 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
moxie 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
msp430 * libc/include/complex.h (cabsl): Add prototype. 2015-02-06 16:14:04 +00:00
mt 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
nds32 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
necv70 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
nios2 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
or1k 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
powerpc 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
rl78 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
rx For the RX port, avoid using string instructions when __RX_DISALLOW_STRING_INSNS__ is defined. 2015-04-23 21:57:13 +02:00
sh 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
sparc 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
spu 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
tic4x 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
tic6x 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
tic80 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
v850 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
visium * COPYING.LIBGLOSS: Add Controls and Data Services copyright. 2015-01-21 18:27:47 +00:00
w65 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
x86_64 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
xc16x 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
xscale 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
xstormy16 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
z8k 2014-12-18 Jeff Johnston <jjohnstn@redhat.com> 2014-12-18 20:30:11 +00:00
Makefile.am * ltmain.sh: Update from GCC. 2007-05-24 17:33:42 +00:00
Makefile.in 2012-12-20 Jeff Johnston <jjohnstn@redhat.com> 2012-12-20 21:10:27 +00:00
aclocal.m4 2012-12-20 Jeff Johnston <jjohnstn@redhat.com> 2012-12-20 21:10:27 +00:00
configure * COPYING.LIBGLOSS: Add Controls and Data Services copyright. 2015-01-21 18:27:47 +00:00
configure.in * COPYING.LIBGLOSS: Add Controls and Data Services copyright. 2015-01-21 18:27:47 +00:00