Commit 9a1fab59 authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard

loader: Run checks also on ARM Linux.

parent 07630a9e
...@@ -109,8 +109,9 @@ static void check_command_line( int argc, char *argv[] ) ...@@ -109,8 +109,9 @@ static void check_command_line( int argc, char *argv[] )
} }
#if defined(__linux__) && defined(__i386__) #if defined(__linux__) && (defined(__i386__) || defined(__arm__))
#ifdef __i386__
/* separate thread to check for NPTL and TLS features */ /* separate thread to check for NPTL and TLS features */
static void *needs_pthread( void *arg ) static void *needs_pthread( void *arg )
{ {
...@@ -140,6 +141,11 @@ static void check_threading(void) ...@@ -140,6 +141,11 @@ static void check_threading(void)
pthread_join( id, &ret ); pthread_join( id, &ret );
if (!ret) exit(1); if (!ret) exit(1);
} }
#else
static void check_threading(void)
{
}
#endif
static void check_vmsplit( void *stack ) static void check_vmsplit( void *stack )
{ {
...@@ -171,7 +177,11 @@ static int pre_exec(void) ...@@ -171,7 +177,11 @@ static int pre_exec(void)
check_threading(); check_threading();
check_vmsplit( &temp ); check_vmsplit( &temp );
set_max_limit( RLIMIT_AS ); set_max_limit( RLIMIT_AS );
return 1; #ifdef __i386__
return 1; /* we have a preloader on x86 */
#else
return 0;
#endif
} }
#elif defined(__linux__) && defined(__x86_64__) #elif defined(__linux__) && defined(__x86_64__)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment