@@ -692,14 +692,14 @@ int expect_strtox(int llen, void *func, const char *input, int base, intmax_t ex
692
692
__attribute__((constructor ))
693
693
static void constructor1 (void )
694
694
{
695
- constructor_test_value = 1 ;
695
+ constructor_test_value | = 1 << 0 ;
696
696
}
697
697
698
698
__attribute__((constructor ))
699
699
static void constructor2 (int argc , char * * argv , char * * envp )
700
700
{
701
701
if (argc && argv && envp )
702
- constructor_test_value *= 2 ;
702
+ constructor_test_value |= 1 << 1 ;
703
703
}
704
704
705
705
int run_startup (int min , int max )
@@ -738,9 +738,9 @@ int run_startup(int min, int max)
738
738
CASE_TEST (environ_HOME ); EXPECT_PTRNZ (1 , getenv ("HOME" )); break ;
739
739
CASE_TEST (auxv_addr ); EXPECT_PTRGT (test_auxv != (void * )-1 , test_auxv , brk ); break ;
740
740
CASE_TEST (auxv_AT_UID ); EXPECT_EQ (1 , getauxval (AT_UID ), getuid ()); break ;
741
- CASE_TEST (constructor ); EXPECT_EQ (is_nolibc , constructor_test_value , 2 ); break ;
741
+ CASE_TEST (constructor ); EXPECT_EQ (is_nolibc , constructor_test_value , 0x3 ); break ;
742
742
CASE_TEST (linkage_errno ); EXPECT_PTREQ (1 , linkage_test_errno_addr (), & errno ); break ;
743
- CASE_TEST (linkage_constr ); EXPECT_EQ (is_nolibc , linkage_test_constructor_test_value , 6 ); break ;
743
+ CASE_TEST (linkage_constr ); EXPECT_EQ (1 , linkage_test_constructor_test_value , 0x3 ); break ;
744
744
case __LINE__ :
745
745
return ret ; /* must be last */
746
746
/* note: do not set any defaults so as to permit holes above */
0 commit comments