add space in RPATH; propagate schemef.h info
svn: r1748
This commit is contained in:
parent
9082176cda
commit
5de8aa8318
13
src/configure
vendored
13
src/configure
vendored
|
@ -11016,8 +11016,17 @@ if test "${enable_shared}" = "yes" ; then
|
|||
STATIC_AR="${LTDIR}/libtool --mode=link $CC -o"
|
||||
ARFLAGS=""
|
||||
RANLIB=":"
|
||||
MZLINKER="${LTDIR}/libtool --mode=link $CC${need_gcc_static_libgcc} -rpath ${absprefix}/lib"
|
||||
MREDLINKER="${LTDIR}/libtool --mode=link $CXX${need_gcc_static_libgcc} -rpath ${absprefix}/lib"
|
||||
exes="xxxxxxxx"
|
||||
exes="${exes}${exes}"
|
||||
exes="${exes}${exes}"
|
||||
exes="${exes}${exes}"
|
||||
exes="${exes}${exes}"
|
||||
exes="${exes}${exes}"
|
||||
exes="${exes}${exes}"
|
||||
exes="${exes}${exes}"
|
||||
padding="padding$exes"
|
||||
MZLINKER="${LTDIR}/libtool --mode=link $CC${need_gcc_static_libgcc} -rpath ${absprefix}/lib -rpath ${absprefix}/lib/${padding}"
|
||||
MREDLINKER="${LTDIR}/libtool --mode=link $CXX${need_gcc_static_libgcc} -rpath ${absprefix}/lib -rpath ${absprefix}/lib/${padding}"
|
||||
PLAIN_CC="$CC"
|
||||
CC="${LTDIR}/libtool --mode=compile $CC"
|
||||
CXX="${LTDIR}/libtool --mode=compile $CXX"
|
||||
|
|
|
@ -982,8 +982,17 @@ if test "${enable_shared}" = "yes" ; then
|
|||
STATIC_AR="${LTDIR}/libtool --mode=link $CC -o"
|
||||
ARFLAGS=""
|
||||
RANLIB=":"
|
||||
MZLINKER="${LTDIR}/libtool --mode=link $CC${need_gcc_static_libgcc} -rpath ${absprefix}/lib"
|
||||
MREDLINKER="${LTDIR}/libtool --mode=link $CXX${need_gcc_static_libgcc} -rpath ${absprefix}/lib"
|
||||
exes="xxxxxxxx"
|
||||
exes="${exes}${exes}"
|
||||
exes="${exes}${exes}"
|
||||
exes="${exes}${exes}"
|
||||
exes="${exes}${exes}"
|
||||
exes="${exes}${exes}"
|
||||
exes="${exes}${exes}"
|
||||
exes="${exes}${exes}"
|
||||
padding="padding$exes"
|
||||
MZLINKER="${LTDIR}/libtool --mode=link $CC${need_gcc_static_libgcc} -rpath ${absprefix}/lib -rpath ${absprefix}/lib/${padding}"
|
||||
MREDLINKER="${LTDIR}/libtool --mode=link $CXX${need_gcc_static_libgcc} -rpath ${absprefix}/lib -rpath ${absprefix}/lib/${padding}"
|
||||
PLAIN_CC="$CC"
|
||||
CC="${LTDIR}/libtool --mode=compile $CC"
|
||||
CXX="${LTDIR}/libtool --mode=compile $CXX"
|
||||
|
|
|
@ -17,6 +17,7 @@ scheme_inherit_cells
|
|||
scheme_current_break_cell
|
||||
scheme_current_thread
|
||||
scheme_fuel_counter
|
||||
scheme_get_current_thread
|
||||
scheme_start_atomic
|
||||
scheme_end_atomic
|
||||
scheme_end_atomic_no_swap
|
||||
|
|
|
@ -17,6 +17,7 @@ scheme_inherit_cells
|
|||
scheme_current_break_cell
|
||||
scheme_current_thread
|
||||
scheme_fuel_counter
|
||||
scheme_get_current_thread
|
||||
scheme_start_atomic
|
||||
scheme_end_atomic
|
||||
scheme_end_atomic_no_swap
|
||||
|
|
|
@ -19,6 +19,7 @@ EXPORTS
|
|||
scheme_current_break_cell
|
||||
scheme_current_thread DATA
|
||||
scheme_fuel_counter DATA
|
||||
scheme_get_current_thread
|
||||
scheme_start_atomic
|
||||
scheme_end_atomic
|
||||
scheme_end_atomic_no_swap
|
||||
|
|
|
@ -60,6 +60,7 @@ volatile int scheme_fuel_counter;
|
|||
Scheme_Thread **scheme_current_thread_ptr;
|
||||
volatile int *scheme_fuel_counter_ptr;
|
||||
#endif
|
||||
Scheme_Thread *(*scheme_get_current_thread)();
|
||||
void (*scheme_start_atomic)(void);
|
||||
void (*scheme_end_atomic)(void);
|
||||
void (*scheme_end_atomic_no_swap)(void);
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
scheme_extension_table->scheme_current_thread_ptr = scheme_current_thread_ptr;
|
||||
scheme_extension_table->scheme_fuel_counter_ptr = scheme_fuel_counter_ptr;
|
||||
#endif
|
||||
scheme_extension_table->scheme_get_current_thread = scheme_get_current_thread;
|
||||
scheme_extension_table->scheme_start_atomic = scheme_start_atomic;
|
||||
scheme_extension_table->scheme_end_atomic = scheme_end_atomic;
|
||||
scheme_extension_table->scheme_end_atomic_no_swap = scheme_end_atomic_no_swap;
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#define scheme_current_thread_ptr (scheme_extension_table->scheme_current_thread_ptr)
|
||||
#define scheme_fuel_counter_ptr (scheme_extension_table->scheme_fuel_counter_ptr)
|
||||
#endif
|
||||
#define scheme_get_current_thread (scheme_extension_table->scheme_get_current_thread)
|
||||
#define scheme_start_atomic (scheme_extension_table->scheme_start_atomic)
|
||||
#define scheme_end_atomic (scheme_extension_table->scheme_end_atomic)
|
||||
#define scheme_end_atomic_no_swap (scheme_extension_table->scheme_end_atomic_no_swap)
|
||||
|
|
Loading…
Reference in New Issue
Block a user