RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: js Date: 04-Nov-2010 12:41:01 Branch: rpm-5_2 Handle: 2010110411410100 Added files: (Branch: rpm-5_2) js/src jscpucfg_Darwin-i386.h jscpucfg_Darwin-ppc.h jscpucfg_Darwin-ppc64.h jscpucfg_Darwin-x86_64.h Modified files: (Branch: rpm-5_2) js/src jscpucfg.c Log: jscpucfg.h: use pre-generated runtime configuration, for Universal on Darwin Summary: Revision Changes Path 1.1.1.1.2.1 +14 -0 js/src/jscpucfg.c 1.1.2.1 +54 -0 js/src/jscpucfg_Darwin-i386.h 1.1.2.1 +54 -0 js/src/jscpucfg_Darwin-ppc.h 1.1.2.1 +54 -0 js/src/jscpucfg_Darwin-ppc64.h 1.1.2.1 +54 -0 js/src/jscpucfg_Darwin-x86_64.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: js/src/jscpucfg.c ============================================================================ $ cvs diff -u -r1.1.1.1 -r1.1.1.1.2.1 jscpucfg.c --- js/src/jscpucfg.c 20 Apr 2009 18:28:03 -0000 1.1.1.1 +++ js/src/jscpucfg.c 4 Nov 2010 11:41:01 -0000 1.1.1.1.2.1 @@ -177,6 +177,19 @@ BitsPerByte(); +#if defined(RPM_OS_DARWIN) + printf("#if defined (__ppc__)\n"); + printf("#include \"jscpucfg_Darwin-ppc.h\"\n"); + printf("#elif defined (__ppc64__)\n"); + printf("#include \"jscpucfg_Darwin-ppc64.h\"\n"); + printf("#elif defined (__i386__)\n"); + printf("#include \"jscpucfg_Darwin-i386.h\"\n"); + printf("#elif defined (__x86_64__)\n"); + printf("#include \"jscpucfg_Darwin-x86_64.h\"\n"); + printf("#else\n"); + printf("#error architecture not supported\n"); + printf("#endif\n"); +#else /* !RPM_OS_DARWIN */ printf("#ifndef js_cpucfg___\n"); printf("#define js_cpucfg___\n\n"); @@ -390,6 +403,7 @@ printf("\n"); printf("#endif /* js_cpucfg___ */\n"); +#endif /* RPM_OS_DARWIN */ return EXIT_SUCCESS; } @@ . patch -p0 <<'@@ .' Index: js/src/jscpucfg_Darwin-i386.h ============================================================================ $ cvs diff -u -r0 -r1.1.2.1 jscpucfg_Darwin-i386.h --- /dev/null 2010-11-04 12:38:03.000000000 +0100 +++ jscpucfg_Darwin-i386.h 2010-11-04 12:41:01.726731605 +0100 @@ -0,0 +1,54 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 4L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 4L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#define JS_HAVE_LONG_LONG + +#endif /* js_cpucfg___ */ @@ . patch -p0 <<'@@ .' Index: js/src/jscpucfg_Darwin-ppc.h ============================================================================ $ cvs diff -u -r0 -r1.1.2.1 jscpucfg_Darwin-ppc.h --- /dev/null 2010-11-04 12:38:03.000000000 +0100 +++ jscpucfg_Darwin-ppc.h 2010-11-04 12:41:01.756732930 +0100 @@ -0,0 +1,54 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 4L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 4L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#define JS_HAVE_LONG_LONG + +#endif /* js_cpucfg___ */ @@ . patch -p0 <<'@@ .' Index: js/src/jscpucfg_Darwin-ppc64.h ============================================================================ $ cvs diff -u -r0 -r1.1.2.1 jscpucfg_Darwin-ppc64.h --- /dev/null 2010-11-04 12:38:03.000000000 +0100 +++ jscpucfg_Darwin-ppc64.h 2010-11-04 12:41:01.786734256 +0100 @@ -0,0 +1,54 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 8L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 8L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 64L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 64L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 6L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 6L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 8L +#define JS_ALIGN_OF_INT64 8L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 8L +#define JS_ALIGN_OF_POINTER 8L +#define JS_ALIGN_OF_WORD 8L + +#define JS_BYTES_PER_WORD_LOG2 3L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 0L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#define JS_HAVE_LONG_LONG + +#endif /* js_cpucfg___ */ @@ . patch -p0 <<'@@ .' Index: js/src/jscpucfg_Darwin-x86_64.h ============================================================================ $ cvs diff -u -r0 -r1.1.2.1 jscpucfg_Darwin-x86_64.h --- /dev/null 2010-11-04 12:38:03.000000000 +0100 +++ jscpucfg_Darwin-x86_64.h 2010-11-04 12:41:01.816735861 +0100 @@ -0,0 +1,54 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 8L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 8L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 64L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 64L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 6L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 6L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 8L +#define JS_ALIGN_OF_INT64 8L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 8L +#define JS_ALIGN_OF_POINTER 8L +#define JS_ALIGN_OF_WORD 8L + +#define JS_BYTES_PER_WORD_LOG2 3L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 0L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#define JS_HAVE_LONG_LONG + +#endif /* js_cpucfg___ */ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org