diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-05-04 23:40:47 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-05-10 08:44:51 +0200 |
| commit | c21c7830ac2486f1c6933d9c18bff996b0ffacb1 (patch) | |
| tree | 6759b80207fd038286d0055df5d1d8bf1ec01684 /Configurations | |
| parent | 59a56c4cf02bbf1efeda6c2a5893d5079db78ff3 (diff) | |
IRIX fixes.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/10-main.conf | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 4c58f05751..f4246def39 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -303,44 +303,16 @@ sub vms_info { multilib => "/64", }, -#### IRIX 5.x configs -# -mips2 flag is added by ./config when appropriate. - "irix-gcc" => { - inherit_from => [ "BASE_unix", asm("mips32_asm") ], - cc => "gcc", - cflags => picker(default => "-DB_ENDIAN", - debug => "-g -O0", - release => "-O3"), - bn_ops => "BN_LLONG RC4_CHAR", - thread_scheme => "(unknown)", - perlasm_scheme => "o32", - dso_scheme => "dlfcn", - shared_target => "irix-shared", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "irix-cc" => { - inherit_from => [ "BASE_unix", asm("mips32_asm") ], - cc => "cc", - cflags => picker(default => "-use_readonly_const -DB_ENDIAN", - debug => "-g -O0", - release => "-O2"), - bn_ops => "BN_LLONG RC4_CHAR", - thread_scheme => "(unknown)", - perlasm_scheme => "o32", - dso_scheme => "dlfcn", - shared_target => "irix-shared", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, #### IRIX 6.x configs -# Only N32 and N64 ABIs are supported. If you need O32 ABI build, invoke -# './Configure irix-cc -o32' manually. +# Only N32 and N64 ABIs are supported. "irix-mips3-gcc" => { inherit_from => [ "BASE_unix", asm("mips64_asm") ], cc => "gcc", cflags => combine(picker(default => "-mabi=n32 -DB_ENDIAN -DBN_DIV3W", debug => "-g -O0", release => "-O3"), - threads("-D_SGI_MP_SOURCE -pthread")), + threads("-D_SGI_MP_SOURCE")), + ex_libs => add(threads("-lpthread")), bn_ops => "RC4_CHAR SIXTY_FOUR_BIT", thread_scheme => "pthreads", perlasm_scheme => "n32", @@ -375,6 +347,7 @@ sub vms_info { debug => "-g -O0", release => "-O3"), threads("-D_SGI_MP_SOURCE")), + ex_libs => add(threads("-lpthread")), bn_ops => "RC4_CHAR SIXTY_FOUR_BIT_LONG", thread_scheme => "pthreads", perlasm_scheme => "64", |