mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-04 22:40:25 +02:00
Code Activity

S390: Replace s390x filenames with s390

Browse source 
* include/lightning/jit_s390.h, lib/jit_s390-cpu.c,
	lib/jit_s390-fpu.c, lib/jit_s390-sz.c, lib/jit_s390.c:
	Renamed s390x* files to s390*.

	* check/float.tst, check/lightning.c, configure.ac,
	include/lightning.h, include/lightning/Makefile.am,
	lib/Makefile.am, lib/jit_s390.c, lib/jit_size.c,
	lib/lightning.c: Update for renamed files.
This commit is contained in:
pcpa 2015-01-08 13:01:49 -02:00
parent 32c4f90a2b
commit 192f89c0ee
14 changed files with 34 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2015-01-08 Paulo Andrade <pcpa@gnu.org>
* include/lightning/jit_s390.h, lib/jit_s390-cpu.c,
lib/jit_s390-fpu.c, lib/jit_s390-sz.c, lib/jit_s390.c:
Renamed s390x* files to s390*.
* check/float.tst, check/lightning.c, configure.ac,
include/lightning.h, include/lightning/Makefile.am,
lib/Makefile.am, lib/jit_s390.c, lib/jit_size.c,
lib/lightning.c: Update for renamed files.
2015-01-08 Paulo Andrade <pcpa@gnu.org> 2015-01-08 Paulo Andrade <pcpa@gnu.org>
* include/lightning.h, include/lightning/jit_private.h, * include/lightning.h, include/lightning/jit_private.h,

2
check/float.tst
View file

@ -21,7 +21,7 @@ ok:
#else #else
# define wnan x80 # define wnan x80
#endif #endif
#if __mips__ || __arm__ || __ppc__ || __sparc__ || __hppa__ || __aarch64__ || __s390x__ #if __mips__ || __arm__ || __ppc__ || __sparc__ || __hppa__ || __aarch64__ || __s390__
# define wpinf x7f # define wpinf x7f
#elif __alpha__ #elif __alpha__
/* (at least) bug compatible with gcc 4.2.3 -ieee */ /* (at least) bug compatible with gcc 4.2.3 -ieee */

6
check/lightning.c
View file

@ -1914,7 +1914,7 @@ get_float(skip_t skip)
static float static float
make_float(double d) make_float(double d)
{ {
/* This is an workaround to a bug in Hercules s390x emulator, /* This is an workaround to a bug in Hercules s390 emulator,
* and at least HP-UX ia64 not have these */ * and at least HP-UX ia64 not have these */
#if defined(HAVE_ISNAN) && defined(HAVE_ISINF) #if defined(HAVE_ISNAN) && defined(HAVE_ISINF)
if (isnan(d)) return ( 0.0f/0.0f); if (isnan(d)) return ( 0.0f/0.0f);
@ -4194,10 +4194,10 @@ main(int argc, char *argv[])
sizeof(cmdline) - opt_short, sizeof(cmdline) - opt_short,
" -D__aarch64__=1"); " -D__aarch64__=1");
#endif #endif
#if defined(__s390x__) #if defined(__s390__) || defined(__s390x__)
opt_short += snprintf(cmdline + opt_short, opt_short += snprintf(cmdline + opt_short,
sizeof(cmdline) - opt_short, sizeof(cmdline) - opt_short,
" -D__s390x__=1"); " -D__s390__=1");
#endif #endif
#if defined(__alpha__) #if defined(__alpha__)
opt_short += snprintf(cmdline + opt_short, opt_short += snprintf(cmdline + opt_short,

6
configure.ac
View file

@ -130,7 +130,7 @@ case "$target_cpu" in
ia64) cpu=ia64 ;; ia64) cpu=ia64 ;;
hppa*) cpu=hppa ;; hppa*) cpu=hppa ;;
aarch64) cpu=aarch64 ;; aarch64) cpu=aarch64 ;;
s390x) cpu=s390x ;; s390*) cpu=s390 ;;
alpha*) cpu=alpha ;; alpha*) cpu=alpha ;;
*) ;; *) ;;
esac esac
@ -142,7 +142,7 @@ AM_CONDITIONAL(cpu_x86, [test cpu-$cpu = cpu-x86])
AM_CONDITIONAL(cpu_ia64, [test cpu-$cpu = cpu-ia64]) AM_CONDITIONAL(cpu_ia64, [test cpu-$cpu = cpu-ia64])
AM_CONDITIONAL(cpu_hppa, [test cpu-$cpu = cpu-hppa]) AM_CONDITIONAL(cpu_hppa, [test cpu-$cpu = cpu-hppa])
AM_CONDITIONAL(cpu_aarch64, [test cpu-$cpu = cpu-aarch64]) AM_CONDITIONAL(cpu_aarch64, [test cpu-$cpu = cpu-aarch64])
AM_CONDITIONAL(cpu_s390x, [test cpu-$cpu = cpu-s390x]) AM_CONDITIONAL(cpu_s390, [test cpu-$cpu = cpu-s390])
AM_CONDITIONAL(cpu_alpha, [test cpu-$cpu = cpu-alpha]) AM_CONDITIONAL(cpu_alpha, [test cpu-$cpu = cpu-alpha])
# Test x87 if both, x87 and sse2 available # Test x87 if both, x87 and sse2 available
@ -237,7 +237,7 @@ AM_CONDITIONAL(test_x86_x87, [test x$ac_cv_test_x86_x87 = xyes])
AM_CONDITIONAL(test_arm_arm, [test x$ac_cv_test_arm_arm = xyes]) AM_CONDITIONAL(test_arm_arm, [test x$ac_cv_test_arm_arm = xyes])
AM_CONDITIONAL(test_arm_swf, [test x$ac_cv_test_arm_swf = xyes]) AM_CONDITIONAL(test_arm_swf, [test x$ac_cv_test_arm_swf = xyes])
AM_CONDITIONAL(test_nodata, [test cpu-$cpu = cpu-mips -o cpu-$cpu = cpu-ppc -o cpu-$cpu = cpu-sparc -o cpu-$cpu = cpu-x86 -o cpu-$cpu = cpu-ia64 -o cpu-$cpu = cpu-hppa -o cpu-$cpu = cpu-s390x -o cpu-$cpu = cpu-alpha]) AM_CONDITIONAL(test_nodata, [test cpu-$cpu = cpu-mips -o cpu-$cpu = cpu-ppc -o cpu-$cpu = cpu-sparc -o cpu-$cpu = cpu-x86 -o cpu-$cpu = cpu-ia64 -o cpu-$cpu = cpu-hppa -o cpu-$cpu = cpu-s390 -o cpu-$cpu = cpu-alpha])
if test $cpu = arm; then if test $cpu = arm; then
AC_CHECK_LIB(m, sqrtf, , AC_CHECK_LIB(m, sqrtf, ,

2
include/lightning.h
View file

@ -141,7 +141,7 @@ typedef jit_int32_t jit_fpr_t;
#elif defined(__aarch64__) #elif defined(__aarch64__)
# include <lightning/jit_aarch64.h> # include <lightning/jit_aarch64.h>
#elif defined(__s390__) || defined(__s390x__) #elif defined(__s390__) || defined(__s390x__)
# include <lightning/jit_s390x.h> # include <lightning/jit_s390.h>
#elif defined(__alpha__) #elif defined(__alpha__)
# include <lightning/jit_alpha.h> # include <lightning/jit_alpha.h>
#endif #endif

4
include/lightning/Makefile.am
View file

@ -51,9 +51,9 @@ if cpu_aarch64
lightning_include_HEADERS = \ lightning_include_HEADERS = \
jit_aarch64.h jit_aarch64.h
endif endif
if cpu_s390x if cpu_s390
lightning_include_HEADERS = \ lightning_include_HEADERS = \
jit_s390x.h jit_s390.h
endif endif
if cpu_alpha if cpu_alpha
lightning_include_HEADERS = \ lightning_include_HEADERS = \

6
include/lightning/jit_s390x.h → include/lightning/jit_s390.h
View file

@ -17,8 +17,8 @@
* Paulo Cesar Pereira de Andrade * Paulo Cesar Pereira de Andrade
*/ */
#ifndef _jit_s390x_h #ifndef _jit_s390_h
#define _jit_s390x_h #define _jit_s390_h
#define JIT_HASH_CONSTS 1 #define JIT_HASH_CONSTS 1
#define JIT_NUM_OPERANDS 2 #define JIT_NUM_OPERANDS 2
@ -71,4 +71,4 @@ typedef enum {
#define JIT_NOREG _NOREG #define JIT_NOREG _NOREG
} jit_reg_t; } jit_reg_t;
#endif /* _jit_s390x_h */ #endif /* _jit_s390_h */

8
lib/Makefile.am
View file

@ -62,10 +62,10 @@ EXTRA_DIST = \
jit_ppc-cpu.c \ jit_ppc-cpu.c \
jit_ppc-fpu.c \ jit_ppc-fpu.c \
jit_ppc-sz.c \ jit_ppc-sz.c \
jit_s390x.c \ jit_s390.c \
jit_s390x-cpu.c \ jit_s390-cpu.c \
jit_s390x-fpu.c \ jit_s390-fpu.c \
jit_s390x-sz.c \ jit_s390-sz.c \
jit_sparc.c \ jit_sparc.c \
jit_sparc-cpu.c \ jit_sparc-cpu.c \
jit_sparc-fpu.c \ jit_sparc-fpu.c \

0
lib/jit_s390x-cpu.c → lib/jit_s390-cpu.c
View file

0
lib/jit_s390x-fpu.c → lib/jit_s390-fpu.c
View file

0
lib/jit_s390x-sz.c → lib/jit_s390-sz.c
View file

8
lib/jit_s390x.c → lib/jit_s390.c
View file

@ -45,8 +45,8 @@ static void _patch(jit_state_t*,jit_word_t,jit_node_t*);
extern void __clear_cache(void *, void *); extern void __clear_cache(void *, void *);
#define PROTO 1 #define PROTO 1
# include "jit_s390x-cpu.c" # include "jit_s390-cpu.c"
# include "jit_s390x-fpu.c" # include "jit_s390-fpu.c"
#undef PROTO #undef PROTO
/* /*
@ -1205,8 +1205,8 @@ _emit_code(jit_state_t *_jit)
} }
#define CODE 1 #define CODE 1
# include "jit_s390x-cpu.c" # include "jit_s390-cpu.c"
# include "jit_s390x-fpu.c" # include "jit_s390-fpu.c"
#undef CODE #undef CODE
void void

2
lib/jit_size.c
View file

@ -47,7 +47,7 @@ static jit_int16_t _szs[jit_code_last_code + 1] = {
# elif defined(__aarch64__) # elif defined(__aarch64__)
# include "jit_aarch64-sz.c" # include "jit_aarch64-sz.c"
# elif defined(__s390__) || defined(__s390x__) # elif defined(__s390__) || defined(__s390x__)
# include "jit_s390x-sz.c" # include "jit_s390-sz.c"
# elif defined(__alpha__) # elif defined(__alpha__)
# include "jit_alpha-sz.c" # include "jit_alpha-sz.c"
# endif # endif

2
lib/lightning.c
View file

@ -3186,7 +3186,7 @@ _patch_register(jit_state_t *_jit, jit_node_t *node, jit_node_t *link,
#elif defined(__aarch64__) #elif defined(__aarch64__)
# include "jit_aarch64.c" # include "jit_aarch64.c"
#elif defined(__s390__) || defined(__s390x__) #elif defined(__s390__) || defined(__s390x__)
# include "jit_s390x.c" # include "jit_s390.c"
#elif defined(__alpha__) #elif defined(__alpha__)
# include "jit_alpha.c" # include "jit_alpha.c"
#endif #endif