Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove obsolete specs from config files #8918

Merged
merged 1 commit into from Mar 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 0 additions & 43 deletions runtime/gc_glue_java/configure_includes/configure_aix_ppc.mk
Expand Up @@ -37,24 +37,6 @@ ifeq (aix_ppc-64_cmprssptrs, $(SPEC))
OMR_GC_POINTER_MODE=compressed
endif

ifeq (aix_ppc-64_cmprssptrs_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_AIX \
--enable-OMR_ARCH_POWER \
--enable-OMR_ENV_DATA64 \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
OMR_GC_POINTER_MODE=compressed
endif

ifeq (aix_ppc-64_codecov, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_AIX \
--enable-OMR_ARCH_POWER \
--enable-OMR_ENV_DATA64 \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
OMR_GC_POINTER_MODE=full
endif

ifeq (aix_ppc-64, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_AIX \
Expand All @@ -65,23 +47,6 @@ ifeq (aix_ppc-64, $(SPEC))
OMR_GC_POINTER_MODE=full
endif

ifeq (aix_ppc-64_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_AIX \
--enable-OMR_ARCH_POWER \
--enable-OMR_ENV_DATA64 \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
OMR_GC_POINTER_MODE=full
endif

ifeq (aix_ppc_codecov, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_AIX \
--enable-OMR_ARCH_POWER \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
OMR_GC_POINTER_MODE=full
endif

ifeq (aix_ppc, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_AIX \
Expand All @@ -90,14 +55,6 @@ ifeq (aix_ppc, $(SPEC))
OMR_GC_POINTER_MODE=full
endif

ifeq (aix_ppc_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_AIX \
--enable-OMR_ARCH_POWER \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
OMR_GC_POINTER_MODE=full
endif

CONFIGURE_ARGS += libprefix=lib exeext= solibext=.so arlibext=.a objext=.o

ifeq (default,$(origin CC))
Expand Down
48 changes: 0 additions & 48 deletions runtime/gc_glue_java/configure_includes/configure_linux_390.mk
Expand Up @@ -32,16 +32,6 @@ CONFIGURE_ARGS += \
--enable-OMR_THR_YIELD_ALG \
--enable-OMR_THR_SPIN_WAKE_CONTROL

ifeq (linux_390-64_cmprssptrs_codecov, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
--enable-OMR_ARCH_S390 \
--enable-OMR_ENV_DATA64 \
--enable-OMR_GC_DOUBLE_MAP_ARRAYLETS \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
OMR_GC_POINTER_MODE=compressed
endif

ifeq (linux_390-64_cmprssptrs, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
Expand All @@ -54,26 +44,6 @@ ifeq (linux_390-64_cmprssptrs, $(SPEC))
OMR_GC_POINTER_MODE=compressed
endif

ifeq (linux_390-64_cmprssptrs_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
--enable-OMR_ARCH_S390 \
--enable-OMR_ENV_DATA64 \
--enable-OMR_GC_DOUBLE_MAP_ARRAYLETS \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
OMR_GC_POINTER_MODE=compressed
endif

ifeq (linux_390-64_codecov, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
--enable-OMR_ARCH_S390 \
--enable-OMR_ENV_DATA64 \
--enable-OMR_GC_DOUBLE_MAP_ARRAYLETS \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
OMR_GC_POINTER_MODE=full
endif

ifeq (linux_390-64, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
Expand All @@ -86,16 +56,6 @@ ifeq (linux_390-64, $(SPEC))
OMR_GC_POINTER_MODE=full
endif

ifeq (linux_390-64_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
--enable-OMR_ARCH_S390 \
--enable-OMR_ENV_DATA64 \
--enable-OMR_GC_DOUBLE_MAP_ARRAYLETS \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
OMR_GC_POINTER_MODE=full
endif

ifeq (linux_390, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
Expand All @@ -104,14 +64,6 @@ ifeq (linux_390, $(SPEC))
OMR_GC_POINTER_MODE=full
endif

ifeq (linux_390_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
--enable-OMR_ARCH_S390 \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
OMR_GC_POINTER_MODE=full
endif

CONFIGURE_ARGS += libprefix=lib exeext= solibext=.so arlibext=.a objext=.o

ifeq (default,$(origin CC))
Expand Down
55 changes: 0 additions & 55 deletions runtime/gc_glue_java/configure_includes/configure_linux_ppc.mk
Expand Up @@ -56,18 +56,6 @@ ifeq (linux_ppc-64_cmprssptrs_le_gcc, $(SPEC))
OMR_GC_POINTER_MODE=compressed
endif

ifeq (linux_ppc-64_cmprssptrs_le_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
--enable-OMR_ARCH_POWER \
--enable-OMR_ENV_DATA64 \
--enable-OMR_GC_DOUBLE_MAP_ARRAYLETS \
--enable-OMR_ENV_LITTLE_ENDIAN \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
--enable-OMR_PORT_NUMA_SUPPORT \
OMR_GC_POINTER_MODE=compressed
endif

ifeq (linux_ppc-64_cmprssptrs, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
Expand All @@ -81,17 +69,6 @@ ifeq (linux_ppc-64_cmprssptrs, $(SPEC))
OMR_GC_POINTER_MODE=compressed
endif

ifeq (linux_ppc-64_cmprssptrs_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
--enable-OMR_ARCH_POWER \
--enable-OMR_ENV_DATA64 \
--enable-OMR_GC_DOUBLE_MAP_ARRAYLETS \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
--enable-OMR_PORT_NUMA_SUPPORT \
OMR_GC_POINTER_MODE=compressed
endif

ifeq (linux_ppc-64_le, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
Expand Down Expand Up @@ -121,29 +98,6 @@ ifeq (linux_ppc-64_le_gcc, $(SPEC))
OMR_GC_POINTER_MODE=full
endif

ifeq (linux_ppc-64_le_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
--enable-OMR_ARCH_POWER \
--enable-OMR_ENV_DATA64 \
--enable-OMR_GC_DOUBLE_MAP_ARRAYLETS \
--enable-OMR_ENV_LITTLE_ENDIAN \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
--enable-OMR_PORT_NUMA_SUPPORT \
OMR_GC_POINTER_MODE=full
endif

ifeq (linux_ppc-64_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
--enable-OMR_ARCH_POWER \
--enable-OMR_ENV_DATA64 \
--enable-OMR_GC_DOUBLE_MAP_ARRAYLETS \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
--enable-OMR_PORT_NUMA_SUPPORT \
OMR_GC_POINTER_MODE=full
endif

ifeq (linux_ppc-64, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
Expand All @@ -166,15 +120,6 @@ ifeq (linux_ppc, $(SPEC))
OMR_GC_POINTER_MODE=full
endif

ifeq (linux_ppc_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
--enable-OMR_ARCH_POWER \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
--enable-OMR_PORT_NUMA_SUPPORT \
OMR_GC_POINTER_MODE=full
endif

CONFIGURE_ARGS += libprefix=lib exeext= solibext=.so arlibext=.a objext=.o

# All specs buildspecs named "_gcc" use gcc, others currently use XLC.
Expand Down
61 changes: 0 additions & 61 deletions runtime/gc_glue_java/configure_includes/configure_linux_x86.mk
Expand Up @@ -58,19 +58,6 @@ ifeq (linux_x86-64_cmprssptrs_panama, $(SPEC))
OMR_GC_POINTER_MODE=compressed
endif

ifeq (linux_x86-64_codecov, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
--enable-OMR_ARCH_X86 \
--enable-OMR_ENV_DATA64 \
--enable-OMR_GC_DOUBLE_MAP_ARRAYLETS \
--enable-OMR_ENV_LITTLE_ENDIAN \
--enable-OMR_GC_TLH_PREFETCH_FTA \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
--enable-OMR_PORT_NUMA_SUPPORT \
OMR_GC_POINTER_MODE=full
endif

ifeq (linux_x86-64, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
Expand All @@ -86,17 +73,6 @@ ifeq (linux_x86-64, $(SPEC))
OMR_GC_POINTER_MODE=full
endif

ifeq (linux_x86_codecov, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
--enable-OMR_ARCH_X86 \
--enable-OMR_ENV_LITTLE_ENDIAN \
--enable-OMR_GC_TLH_PREFETCH_FTA \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
--enable-OMR_PORT_NUMA_SUPPORT \
OMR_GC_POINTER_MODE=full
endif

ifeq (linux_x86, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
Expand All @@ -109,43 +85,6 @@ ifeq (linux_x86, $(SPEC))
OMR_GC_POINTER_MODE=full
endif

ifeq (linux_x86-64_cmprssptrs_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
--enable-OMR_ARCH_X86 \
--enable-OMR_ENV_DATA64 \
--enable-OMR_GC_DOUBLE_MAP_ARRAYLETS \
--enable-OMR_ENV_LITTLE_ENDIAN \
--enable-OMR_GC_TLH_PREFETCH_FTA \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
--enable-OMR_PORT_NUMA_SUPPORT \
OMR_GC_POINTER_MODE=compressed
endif

ifeq (linux_x86-64_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
--enable-OMR_ARCH_X86 \
--enable-OMR_ENV_DATA64 \
--enable-OMR_GC_DOUBLE_MAP_ARRAYLETS \
--enable-OMR_ENV_LITTLE_ENDIAN \
--enable-OMR_GC_TLH_PREFETCH_FTA \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
--enable-OMR_PORT_NUMA_SUPPORT \
OMR_GC_POINTER_MODE=full
endif

ifeq (linux_x86_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_UNIX \
--enable-OMR_ARCH_X86 \
--enable-OMR_ENV_LITTLE_ENDIAN \
--enable-OMR_GC_TLH_PREFETCH_FTA \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
--enable-OMR_PORT_NUMA_SUPPORT \
OMR_GC_POINTER_MODE=full
endif

CONFIGURE_ARGS += libprefix=lib exeext= solibext=.so arlibext=.a objext=.o

ifeq (default,$(origin CC))
Expand Down
35 changes: 0 additions & 35 deletions runtime/gc_glue_java/configure_includes/configure_win_x86.mk
Expand Up @@ -40,18 +40,6 @@ ifeq (win_x86-64_cmprssptrs, $(SPEC))
OMR_GC_POINTER_MODE=compressed
endif

ifeq (win_x86-64_cmprssptrs_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_WIN32 \
--enable-OMR_ARCH_X86 \
--enable-OMR_ENV_DATA64 \
--enable-OMR_ENV_LITTLE_ENDIAN \
--enable-OMR_GC_TLH_PREFETCH_FTA \
--enable-OMR_PORT_ALLOCATE_TOP_DOWN \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
OMR_GC_POINTER_MODE=compressed
endif

ifeq (win_x86-64, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_WIN32 \
Expand All @@ -65,18 +53,6 @@ ifeq (win_x86-64, $(SPEC))
OMR_GC_POINTER_MODE=full
endif

ifeq (win_x86-64_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_WIN32 \
--enable-OMR_ARCH_X86 \
--enable-OMR_ENV_DATA64 \
--enable-OMR_ENV_LITTLE_ENDIAN \
--enable-OMR_GC_TLH_PREFETCH_FTA \
--enable-OMR_PORT_ALLOCATE_TOP_DOWN \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
OMR_GC_POINTER_MODE=full
endif

ifeq (win_x86, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_WIN32 \
Expand All @@ -88,17 +64,6 @@ ifeq (win_x86, $(SPEC))
OMR_GC_POINTER_MODE=full
endif

ifeq (win_x86_purec, $(SPEC))
CONFIGURE_ARGS += \
--enable-OMRTHREAD_LIB_WIN32 \
--enable-OMR_ARCH_X86 \
--enable-OMR_ENV_LITTLE_ENDIAN \
--enable-OMR_GC_TLH_PREFETCH_FTA \
--enable-OMR_PORT_ALLOCATE_TOP_DOWN \
--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
OMR_GC_POINTER_MODE=full
endif

CONFIGURE_ARGS += libprefix= exeext=.exe solibext=.dll arlibext=.lib objext=.obj

ifeq (default,$(origin AS))
Expand Down