From Craig Silverstein: don't run function pointer non-PIC tests when

they won't work.
This commit is contained in:
Ian Lance Taylor
2007-10-02 22:45:07 +00:00
parent e84992bbac
commit 63402fe413
5 changed files with 133 additions and 86 deletions

View File

@ -26,11 +26,6 @@ NATIVE_PROGS = \
two_file_same_shared_test \
two_file_separate_shared_12_test \
two_file_separate_shared_21_test \
two_file_shared_1_nonpic_test \
two_file_shared_2_nonpic_test \
two_file_same_shared_nonpic_test \
two_file_separate_shared_12_nonpic_test \
two_file_separate_shared_21_nonpic_test \
exception_test \
exception_static_test \
exception_shared_1_test \
@ -39,6 +34,17 @@ NATIVE_PROGS = \
exception_separate_shared_12_test \
exception_separate_shared_21_test
if FN_PTRS_IN_SO_WITHOUT_PIC
NATIVE_PROGS += \
two_file_shared_1_nonpic_test \
two_file_shared_2_nonpic_test \
two_file_same_shared_nonpic_test \
two_file_separate_shared_12_nonpic_test \
two_file_separate_shared_21_nonpic_test
endif
NATIVE_TESTING = \
basic_test \
basic_pic_test \
@ -128,8 +134,22 @@ two_file_separate_shared_21_test_LDFLAGS = -Bgcctestdir/ -Wl,-R,.
two_file_separate_shared_21_test_LDADD = \
two_file_shared_2.so two_file_shared_1.so
# FIXME: The nonpic tests will fail on platforms which can not put
# non-PIC code into shared libraries; how should we handle this?
two_file_test_1_pic.o: two_file_test_1.cc
$(CXXCOMPILE) -c -fpic -o $@ $<
two_file_test_2_pic.o: two_file_test_2.cc
$(CXXCOMPILE) -c -fpic -o $@ $<
two_file_shared_1.so: two_file_test_1_pic.o
$(CXXLINK) -shared two_file_test_1_pic.o
two_file_shared_2.so: two_file_test_2_pic.o
$(CXXLINK) -shared two_file_test_2_pic.o
two_file_shared.so: two_file_test_1_pic.o two_file_test_2_pic.o
$(CXXLINK) -shared two_file_test_1_pic.o two_file_test_2_pic.o
# The nonpic tests will fail on platforms which can not put non-PIC
# code into shared libraries, so we just don't run them in that case.
if FN_PTRS_IN_SO_WITHOUT_PIC
two_file_shared_1_nonpic_test_SOURCES = \
two_file_test_2.cc two_file_test_main.cc
@ -165,18 +185,6 @@ two_file_separate_shared_21_nonpic_test_LDFLAGS = -Bgcctestdir/ -Wl,-R,.
two_file_separate_shared_21_nonpic_test_LDADD = \
two_file_shared_2_nonpic.so two_file_shared_1_nonpic.so
two_file_test_1_pic.o: two_file_test_1.cc
$(CXXCOMPILE) -c -fpic -o $@ $<
two_file_test_2_pic.o: two_file_test_2.cc
$(CXXCOMPILE) -c -fpic -o $@ $<
two_file_shared_1.so: two_file_test_1_pic.o
$(CXXLINK) -shared two_file_test_1_pic.o
two_file_shared_2.so: two_file_test_2_pic.o
$(CXXLINK) -shared two_file_test_2_pic.o
two_file_shared.so: two_file_test_1_pic.o two_file_test_2_pic.o
$(CXXLINK) -shared two_file_test_1_pic.o two_file_test_2_pic.o
two_file_shared_1_nonpic.so: two_file_test_1.o
$(CXXLINK) -shared two_file_test_1.o
two_file_shared_2_nonpic.so: two_file_test_2.o
@ -184,6 +192,8 @@ two_file_shared_2_nonpic.so: two_file_test_2.o
two_file_shared_nonpic.so: two_file_test_1.o two_file_test_2.o
$(CXXLINK) -shared two_file_test_1.o two_file_test_2.o
endif
exception_test_SOURCES = \
exception_test_main.cc \
exception_test_1.cc \