sp
/
cln_mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

* src/base/cl_low.h: Added several checks if NO_ASM is defined, so 

this definition becomes actually useful.  This is needed for
          compilation on Arm until somebody fixes the assembler files for Arm.
        * src/base/digitseq/cl_asm.h: Likewise.
        * src/base/digitseq/cl_asm_.cc: Likewise.
        * */Makefile.in: Added `override' in front of `CPPFLAGS +=' so
           one can say `make CPPFLAGS=-DFOOBAR'.
master
Richard Kreckel 24 years ago
parent
32f6249700
commit
c16d820fd9
8 changed files with 27 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      ChangeLog
  2. 2
      benchmarks/Makefile.in
  3. 2
      examples/Makefile.in
  4. 4
      src/Makefile.in
  5. 12
      src/base/cl_low.h
  6. 3
      src/base/digitseq/cl_asm.h
  7. 3
      src/base/digitseq/cl_asm_.cc
  8. 2
      tests/Makefile.in

10
ChangeLog
View File

@ -1,3 +1,13 @@
2001-04-25 Richard Kreckel <kreckel@ginac.de>
* src/base/cl_low.h: Added several checks if NO_ASM is defined, so
this definition becomes actually useful. This is needed for
compilation on Arm until somebody fixes the assembler files for Arm.
* src/base/digitseq/cl_asm.h: Likewise.
* src/base/digitseq/cl_asm_.cc: Likewise.
* */Makefile.in: Added `override' in front of `CPPFLAGS +=' so
one can say `make CPPFLAGS=-DFOOBAR'.
2001-03-26 Arvid Norberg <c99ang@cs.umu.se> 2001-03-26 Arvid Norberg <c99ang@cs.umu.se>
* src/base/random/cl_random_from.cc: ported to beos. * src/base/random/cl_random_from.cc: ported to beos.

2
benchmarks/Makefile.in
View File

@ -16,7 +16,7 @@ CXX = @CXX@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
INCLUDES = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(srcdir) INCLUDES = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(srcdir)
CPPFLAGS += $(INCLUDES)
override CPPFLAGS += $(INCLUDES)
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIBTOOL_LINK = $(LIBTOOL) --mode=link LIBTOOL_LINK = $(LIBTOOL) --mode=link
MV = mv MV = mv

2
examples/Makefile.in
View File

@ -19,7 +19,7 @@ CXX = @CXX@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
INCLUDES = -I../include -I$(top_srcdir)/include -I$(srcdir) INCLUDES = -I../include -I$(top_srcdir)/include -I$(srcdir)
CPPFLAGS += $(INCLUDES)
override CPPFLAGS += $(INCLUDES)
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIBTOOL_LINK = $(LIBTOOL) --mode=link LIBTOOL_LINK = $(LIBTOOL) --mode=link
MV = mv MV = mv

4
src/Makefile.in
View File

@ -26,7 +26,7 @@ CXX = @CXX@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
INCLUDES = -I../include -I$(top_srcdir)/include INCLUDES = -I../include -I$(top_srcdir)/include
CPPFLAGS += $(INCLUDES)
override CPPFLAGS += $(INCLUDES)
LIBS = @LIBS@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
@ -69,7 +69,7 @@ VPATH = $(srcdir)/$(SUBDIR) # :
# Add subdirectory specific flags. # Add subdirectory specific flags.
include $(srcdir)/$(SUBDIR)/Makeflags include $(srcdir)/$(SUBDIR)/Makeflags
CPPFLAGS += $(SUBDIR_INCLUDES)
override CPPFLAGS += $(SUBDIR_INCLUDES)
# Need to know the system name. # Need to know the system name.
SYSTEM := $(shell uname -s) SYSTEM := $(shell uname -s)

12
src/base/cl_low.h
View File

@ -295,7 +295,7 @@ inline uint32 mulu32_unchecked (uint32 arg1, uint32 arg2)
#else #else
#define mulu32(x,y,hi_zuweisung,lo_zuweisung) \ #define mulu32(x,y,hi_zuweisung,lo_zuweisung) \
{ lo_zuweisung mulu32_(x,y); hi_zuweisung mulu32_high; } { lo_zuweisung mulu32_(x,y); hi_zuweisung mulu32_high; }
#if defined(__m68k__) || defined(__sparc__) || defined(__sparc64__) || defined(__arm__) || (defined(__i386__) && !defined(WATCOM) && !defined(MICROSOFT)) || defined(__mips__) || defined(__hppa__)
#if (defined(__m68k__) || defined(__sparc__) || defined(__sparc64__) || defined(__arm__) || (defined(__i386__) && !defined(WATCOM) && !defined(MICROSOFT)) || defined(__mips__) || defined(__hppa__)) && !defined(NO_ASM)
// mulu32_ extern in Assembler // mulu32_ extern in Assembler
#if defined(__sparc__) || defined(__sparc64__) #if defined(__sparc__) || defined(__sparc64__)
extern "C" uint32 _get_g1 (void); extern "C" uint32 _get_g1 (void);
@ -344,7 +344,7 @@ inline uint32 mulu32_unchecked (uint32 arg1, uint32 arg2)
hi_zuweisung _hi; \ hi_zuweisung _hi; \
lo_zuweisung _lo; \ lo_zuweisung _lo; \
}) })
#elif defined(__GNUC__) && defined(__sparc64__)
#elif defined(__GNUC__) && defined(__sparc64__) && !defined(NO_ASM)
#define mulu64(x,y,hi_zuweisung,lo_zuweisung) \ #define mulu64(x,y,hi_zuweisung,lo_zuweisung) \
({ lo_zuweisung mulu64_(x,y); /* extern in Assembler */ \ ({ lo_zuweisung mulu64_(x,y); /* extern in Assembler */ \
{var register uint64 _hi __asm__("%g2"); \ {var register uint64 _hi __asm__("%g2"); \
@ -415,7 +415,7 @@ inline uint32 mulu32_unchecked (uint32 arg1, uint32 arg2)
q_zuweisung (uint16)__q; \ q_zuweisung (uint16)__q; \
r_zuweisung (uint16)__r; \ r_zuweisung (uint16)__r; \
}) })
#elif defined(__GNUC__) && (defined(__sparc__) || defined(__sparc64__))
#elif defined(__GNUC__) && (defined(__sparc__) || defined(__sparc64__)) && !defined(NO_ASM)
#define divu_3216_1616(x,y,q_zuweisung,r_zuweisung) \ #define divu_3216_1616(x,y,q_zuweisung,r_zuweisung) \
({ var uint32 __qr = divu_3216_1616_(x,y); /* extern in Assembler */\ ({ var uint32 __qr = divu_3216_1616_(x,y); /* extern in Assembler */\
q_zuweisung low16(__qr); \ q_zuweisung low16(__qr); \
@ -459,13 +459,13 @@ inline uint32 mulu32_unchecked (uint32 arg1, uint32 arg2)
q_zuweisung __q; \ q_zuweisung __q; \
r_zuweisung (__x - __q * __y); \ r_zuweisung (__x - __q * __y); \
}) })
#elif defined(__sparc__) || defined(__sparc64__)
#elif (defined(__sparc__) || defined(__sparc64__)) && !defined(NO_ASM)
#define divu_3216_1616(x,y,q_zuweisung,r_zuweisung) \ #define divu_3216_1616(x,y,q_zuweisung,r_zuweisung) \
{ var uint32 __qr = divu_3216_1616_(x,y); /* extern in Assembler */ \ { var uint32 __qr = divu_3216_1616_(x,y); /* extern in Assembler */ \
q_zuweisung low16(__qr); \ q_zuweisung low16(__qr); \
r_zuweisung high16(__qr); \ r_zuweisung high16(__qr); \
} }
#elif defined(__arm__)
#elif defined(__arm__) && !defined(NO_ASM)
#define divu_3216_1616(x,y,q_zuweisung,r_zuweisung) \ #define divu_3216_1616(x,y,q_zuweisung,r_zuweisung) \
{ q_zuweisung divu_3216_1616_(x,y); /* extern in Assembler */ \ { q_zuweisung divu_3216_1616_(x,y); /* extern in Assembler */ \
r_zuweisung divu_16_rest; \ r_zuweisung divu_16_rest; \
@ -723,7 +723,7 @@ inline uint32 mulu32_unchecked (uint32 arg1, uint32 arg2)
#else #else
#define divu_6432_3232(xhi,xlo,y,q_zuweisung,r_zuweisung) \ #define divu_6432_3232(xhi,xlo,y,q_zuweisung,r_zuweisung) \
{ q_zuweisung divu_6432_3232_(xhi,xlo,y); r_zuweisung divu_32_rest; } { q_zuweisung divu_6432_3232_(xhi,xlo,y); r_zuweisung divu_32_rest; }
#if defined(__m68k__) || defined(__sparc__) || defined(__sparc64__) || defined(__arm__) || (defined(__i386__) && !defined(WATCOM) && !defined(MICROSOFT)) || defined(__hppa__)
#if (defined(__m68k__) || defined(__sparc__) || defined(__sparc64__) || defined(__arm__) || (defined(__i386__) && !defined(WATCOM) && !defined(MICROSOFT)) || defined(__hppa__)) && !defined(NO_ASM)
// divu_6432_3232_ extern in Assembler // divu_6432_3232_ extern in Assembler
#if defined(__sparc__) || defined(__sparc64__) #if defined(__sparc__) || defined(__sparc64__)
extern "C" uint32 _get_g1 (void); extern "C" uint32 _get_g1 (void);

3
src/base/digitseq/cl_asm.h
View File

@ -3,6 +3,8 @@
#include "cln/config.h" #include "cln/config.h"
#include "cl_DS_endian.h" #include "cl_DS_endian.h"
#ifndef NO_ASM
#ifdef __m68k__ #ifdef __m68k__
#include "cl_asm_m68k.h" #include "cl_asm_m68k.h"
#endif #endif
@ -31,3 +33,4 @@
#include "cl_asm_arm.h" #include "cl_asm_arm.h"
#endif #endif
#endif // ndef NO_ASM

3
src/base/digitseq/cl_asm_.cc
View File

@ -3,6 +3,8 @@
#include "cln/config.h" #include "cln/config.h"
#include "cl_DS_endian.h" #include "cl_DS_endian.h"
#ifndef NO_ASM
#ifdef __m68k__ #ifdef __m68k__
#include "cl_asm_m68k_.cc" #include "cl_asm_m68k_.cc"
#endif #endif
@ -31,3 +33,4 @@
#include "cl_asm_arm_.cc" #include "cl_asm_arm_.cc"
#endif #endif
#endif // ndef NO_ASM

2
tests/Makefile.in
View File

@ -16,7 +16,7 @@ CXX = @CXX@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
INCLUDES = -I../include -I$(top_srcdir)/include -I$(srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/base -I$(top_srcdir)/src/float -I$(top_srcdir)/src/float/lfloat -I$(top_srcdir)/src/integer -I$(top_srcdir)/src/base/random -I$(top_srcdir)/src/base/digitseq -I$(top_srcdir)/src/base/digit -I../src/base -I$(top_srcdir)/src/base INCLUDES = -I../include -I$(top_srcdir)/include -I$(srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/base -I$(top_srcdir)/src/float -I$(top_srcdir)/src/float/lfloat -I$(top_srcdir)/src/integer -I$(top_srcdir)/src/base/random -I$(top_srcdir)/src/base/digitseq -I$(top_srcdir)/src/base/digit -I../src/base -I$(top_srcdir)/src/base
CPPFLAGS += $(INCLUDES)
override CPPFLAGS += $(INCLUDES)
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIBTOOL_LINK = $(LIBTOOL) --mode=link LIBTOOL_LINK = $(LIBTOOL) --mode=link
MV = mv MV = mv

Write Preview
Loading…
Cancel
Save