diff --git a/config/opal_config_asm.m4 b/config/opal_config_asm.m4 index ee04917e8b..e5d0719ec2 100644 --- a/config/opal_config_asm.m4 +++ b/config/opal_config_asm.m4 @@ -1220,7 +1220,7 @@ AC_DEFUN([OPAL_CONFIG_ASM],[ # format: # config_file-text-global-label_suffix-gsym-lsym-type-size-align_log-ppc_r_reg-64_bit-gnu_stack - asm_format="${opal_asm_arch_config}" + asm_format="default" asm_format="${asm_format}-${opal_cv_asm_text}-${opal_cv_asm_global}" asm_format="${asm_format}-${opal_cv_asm_label_suffix}-${opal_cv_asm_gsym}" asm_format="${asm_format}-${opal_cv_asm_lsym}" diff --git a/opal/include/opal/sys/architecture.h b/opal/include/opal/sys/architecture.h index b6c2b6d6ae..38338f1ecb 100644 --- a/opal/include/opal/sys/architecture.h +++ b/opal/include/opal/sys/architecture.h @@ -44,8 +44,5 @@ /* Formats */ #define OPAL_DEFAULT 1000 /* standard for given architecture */ -#define OPAL_DARWIN 1001 /* Darwin / OS X on PowerPC */ -#define OPAL_PPC_LINUX 1002 /* Linux on PowerPC */ -#define OPAL_AIX 1003 /* AIX on Power / PowerPC */ #endif /* #ifndef OPAL_SYS_ARCHITECTURE_H */