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.

Sign up for GitHub

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

Jump to bottom

Remove Itanium support #1163

Merged
merged 1 commit into from
Feb 23, 2017
Merged

Remove Itanium support #1163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cnf/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@ Makegap.in: Makegap.top Makefile Makegap.bottom
@echo >> Makegap.in
@echo '# compile and link GAP' >> Makegap.in
@echo 'ifeq ($$(uname_O),Cygwin)' >> Makegap.in
@echo 'gap: $$(OBJECTS) $$(ITANIUMOBJ)' >> Makegap.in
@echo 'gap: $$(OBJECTS)' >> Makegap.in
@echo ' $$(CC) $$(CPPFLAGS) $$(GMP_CFLAGS) $$(CFLAGS) -DCOMPILECYGWINDLL -o gap.o -c ../../src/gap.c' >> Makegap.in
@echo ' $$(CC) $$(LDFLAGS) -o gap.dll -shared $$(OBJECTS) $$(ITANIUMOBJ) -lm -lrt $$(MPILIBS) $$(GMP_LIBS) $$(CONFLIBS)' >> Makegap.in
@echo ' $$(CC) $$(LDFLAGS) -o gap.dll -shared $$(OBJECTS) -lm -lrt $$(MPILIBS) $$(GMP_LIBS) $$(CONFLIBS)' >> Makegap.in
@echo ' $$(CC) $$(LDFLAGS) -o gap ../../src/gapw95.c $$(CPPFLAGS) $$(GMP_CFLAGS) $$(CFLAGS) -DCOMPILECYGWINDLL gap.dll' >> Makegap.in
@echo >> Makegap.in
@echo 'else' >> Makegap.in
@echo 'gap: $$(OBJECTS) $$(ITANIUMOBJ)' >> Makegap.in
@echo ' $$(CC) $$(LDFLAGS) -o gap $$(OBJECTS) $$(ITANIUMOBJ) -lm $$(MPILIBS) $$(GMP_LIBS) $$(CONFLIBS)' >> Makegap.in
@echo 'gap: $$(OBJECTS)' >> Makegap.in
@echo ' $$(CC) $$(LDFLAGS) -o gap $$(OBJECTS) -lm $$(MPILIBS) $$(GMP_LIBS) $$(CONFLIBS)' >> Makegap.in
@echo 'endif' >> Makegap.in
@echo >> Makegap.in
@echo '# dependencies are automatically generated' >> Makegap.in
Expand Down
3 changes: 0 additions & 3 deletions cnf/Makegap.bottom
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
itanium.o: @srcdir@/itanium.s
$(CC) $(CFLAGS) -o itanium.o -c @srcdir@/itanium.s

gapmpi.o: @srcdir@/system.h @srcdir@/gasman.h @srcdir@/objects.h \
@srcdir@/scanner.h @srcdir@/gap.h @srcdir@/read.h \
@srcdir@/calls.h @srcdir@/gvars.h @srcdir@/bool.h \
Expand Down
13 changes: 4 additions & 9 deletions cnf/Makegap.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ CPPFLAGS=-I. -DCONFIG_H @CPPFLAGS@
LDFLAGS=@LDFLAGS@ $(LOPTS)
CC=@CC@

ITANIUMOBJ=@ITANIUMOBJ@

# FIXME: What is LIBSOVERRIDE used for? We should either document this here
# or elsewhere, or find ways to get rid of it.
ifeq "$(LIBSOVERRIDE)" ""
Expand All @@ -36,14 +34,14 @@ OBJECTS=ariths.o backtrace.o blister.o bool.o c_filt1.o c_meths1.o c_oper1.o c_r

# compile and link GAP
ifeq ($(uname_O),Cygwin)
gap: $(OBJECTS) $(ITANIUMOBJ)
gap: $(OBJECTS)
$(CC) $(CPPFLAGS) $(GMP_CFLAGS) $(CFLAGS) -DCOMPILECYGWINDLL -o gap.o -c ../../src/gap.c
$(CC) $(LDFLAGS) -o gap.dll -shared $(OBJECTS) $(ITANIUMOBJ) -lm -lrt $(MPILIBS) $(GMP_LIBS) $(CONFLIBS)
$(CC) $(LDFLAGS) -o gap.dll -shared $(OBJECTS) -lm -lrt $(MPILIBS) $(GMP_LIBS) $(CONFLIBS)
$(CC) $(LDFLAGS) -o gap ../../src/gapw95.c $(CPPFLAGS) $(GMP_CFLAGS) $(CFLAGS) -DCOMPILECYGWINDLL gap.dll

else
gap: $(OBJECTS) $(ITANIUMOBJ)
$(CC) $(LDFLAGS) -o gap $(OBJECTS) $(ITANIUMOBJ) -lm $(MPILIBS) $(GMP_LIBS) $(CONFLIBS)
gap: $(OBJECTS)
$(CC) $(LDFLAGS) -o gap $(OBJECTS) -lm $(MPILIBS) $(GMP_LIBS) $(CONFLIBS)
endif

# dependencies are automatically generated
Expand Down Expand Up @@ -677,9 +675,6 @@ weakptr.o: ../../Makefile @srcdir@/weakptr.c @srcdir@/system.h config.h @srcdir@
@srcdir@/saveload.h @srcdir@/opers.h @srcdir@/hpc/thread.h @srcdir@/hpc/tls.h
$(CC) $(CPPFLAGS) $(GMP_CFLAGS) $(CFLAGS) -o weakptr.o -c @srcdir@/weakptr.c

itanium.o: @srcdir@/itanium.s
$(CC) $(CFLAGS) -o itanium.o -c @srcdir@/itanium.s

gapmpi.o: @srcdir@/system.h @srcdir@/gasman.h @srcdir@/objects.h \
@srcdir@/scanner.h @srcdir@/gap.h @srcdir@/read.h \
@srcdir@/calls.h @srcdir@/gvars.h @srcdir@/bool.h \
Expand Down
2 changes: 0 additions & 2 deletions cnf/Makegap.top
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ CPPFLAGS=-I. -DCONFIG_H @CPPFLAGS@
LDFLAGS=@LDFLAGS@ $(LOPTS)
CC=@CC@

ITANIUMOBJ=@ITANIUMOBJ@

# FIXME: What is LIBSOVERRIDE used for? We should either document this here
# or elsewhere, or find ways to get rid of it.
ifeq "$(LIBSOVERRIDE)" ""
Expand Down
3 changes: 0 additions & 3 deletions cnf/config.hin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,6 @@
function */
#undef HAVE___BUILTIN_SMUL_OVERFLOW

/* define as 1 on Itanium architecture to flush and mark register stack */
#undef ITANIUM

/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT

Expand Down
5 changes: 0 additions & 5 deletions cnf/configure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,12 +384,7 @@ case "$host" in
sparc-* )
AC_DEFINE(SPARC, 1, [define as 1 on SPARC architecture to flush register windows])
;;
ia64-* )
AC_DEFINE(ITANIUM, 1, [define as 1 on Itanium architecture to flush and mark register stack])
ITANIUMOBJ=itanium.o
;;
esac
AC_SUBST(ITANIUMOBJ)

case "$host_os" in
*cygwin*)
Expand Down
16 changes: 1 addition & 15 deletions cnf/configure.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,6 @@ ABI_CFLAGS
ABI
gapbin
gp_configure_options
ITANIUMOBJ
C_DYNLIBS
NM
ac_ct_CXX
Expand Down Expand Up @@ -4173,13 +4172,7 @@ else
gp_cv_prog_cc_cdynlinking='-g -bundle -bundle_loader ${gap_bin}/gap'" ${ABI_CFLAGS}";;
*cygwin* )
gp_cv_prog_cc_cdynlinking='-shared ${gap_bin}/gap.dll';;
*-gcc )
gp_cv_prog_cc_cdynlinking="-shared -g ${ABI_CFLAGS}";;
*-clang )
gp_cv_prog_cc_cdynlinking="-shared -g ${ABI_CFLAGS}";;
*-icc )
gp_cv_prog_cc_cdynlinking="-shared -g ${ABI_CFLAGS}";;
*-egcs )
*-gcc | *-clang | *-icc | *-egcs )
gp_cv_prog_cc_cdynlinking="-shared -g ${ABI_CFLAGS}";;
*hpux* )
gp_cv_prog_cc_cdynlinking="-b +e Init__Dynamic";;
Expand Down Expand Up @@ -6851,16 +6844,9 @@ case "$host" in
$as_echo "#define SPARC 1" >>confdefs.h
;;
ia64-* )
$as_echo "#define ITANIUM 1" >>confdefs.h
ITANIUMOBJ=itanium.o
;;
esac
case "$host_os" in
*cygwin*)
Expand Down
3 changes: 1 addition & 2 deletions cnf/gac.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,7 @@ OBJECTS="\
vecffe.o \
vecgf2.o \
vector.o \
weakptr.o \
@ITANIUMOBJ@
weakptr.o
"


Expand Down
22 changes: 0 additions & 22 deletions src/gasman.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,17 +535,6 @@ void InitSweepFuncBags (
#endif


#if ITANIUM
extern void * ItaniumRegisterStackTop();

static Bag* ItaniumRegisterStackBottom = (Bag *)0;

static void ItaniumSpecialMarkingInit() {
ItaniumRegisterStackBottom = (Bag *)ItaniumRegisterStackTop();
}

#endif

/****************************************************************************
**
*F InitMarkFuncBags(<type>,<mark-func>) . . . . . install marking function
Expand Down Expand Up @@ -1069,9 +1058,6 @@ void InitBags (
StackFuncBags = stack_func;
StackBottomBags = stack_bottom;
StackAlignBags = stack_align;
#if ITANIUM
ItaniumSpecialMarkingInit();
#endif

/* first get some storage from the operating system */
initial_size = (initial_size + 511) & ~(511);
Expand Down Expand Up @@ -1721,14 +1707,6 @@ void GenStackFuncBags ( void )
MARK_BAG( *p );
}
}
#if ITANIUM
/* Itanium has two stacks */
top = ItaniumRegisterStackTop();
for ( i = 0; i < sizeof(Bag*); i += StackAlignBags ) {
for ( p = (Bag*)((char*)ItaniumRegisterStackBottom + i); p < top; p++ )
MARK_BAG( *p );
}
#endif

/* mark from registers, dirty dirty hack */
for ( p = (Bag*)((void*)RegsBags);
Expand Down
76 changes: 0 additions & 76 deletions src/itanium.s
View file
Open in desktop

This file was deleted.