Also support -fpic in -fPIE/-fPIC conflict detection.

diff --git a/bin/blhc b/bin/blhc
index b2188eeb32d36d651da1860500444249c120cd62..210f0ac5a0511f8fcb829493c491b07d94015c9f 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -87,7 +87,7 @@ sub pic_pie_conflict {
     my ($line, $pie, $missing_flags_ref, @flags_pie) = @_;
 
     return 0 if not $pie;
-    return 0 if not any_flags_used($line, ('-fPIC'));
+    return 0 if not any_flags_used($line, ('-fPIC', '-fpic'));
 
     my %flags = map { $_ => 1 } @flags_pie;
 

diff --git a/t/logs/bad-library b/t/logs/bad-library
index d4c5c2387fade8cd95183b23d1154143a826bb6a..811b71151e46f46dc94a06f9fb1cfb69bb03bc80 100644 (file)
--- a/t/logs/bad-library
+++ b/t/logs/bad-library
@@ -5,4 +5,4 @@ gcc -shared -fPIC -DPIC libtest.o -lpthread -O2 -Wl,--as-needed -o libtest.so
 gcc -shared -fPIC test.o -Wl,-z -Wl,relro -o .libs/libtest.so.1.0.0
 
 gcc -shared -o libtest.so.0d ./test-a.o test/./test-b.o -Wl,-z,now -lpthread -ldl
-/usr/bin/g++ -shared -fPIC -o libtest-6.1.so.0 test.o -ltiff -lz
+/usr/bin/g++ -shared -fpic -o libtest-6.1.so.0 test.o -ltiff -lz

diff --git a/t/logs/good-library b/t/logs/good-library
index 6c2147061b0f82f19402fa19a2fce79874d2b59e..5447520651b92e3fb28e0f0e69de3b2a46f66286 100644 (file)
--- a/t/logs/good-library
+++ b/t/logs/good-library
@@ -6,4 +6,4 @@ gcc -shared -fPIC -DPIC libtest.o -lpthread -O2 -Wl,relro -Wl,now -Wl,--as-neede
 gcc -shared -fPIC test.o -Wl,-z -Wl,relro -Wl,now -o .libs/libtest.so.1.0.0
 
 gcc -shared -fPIE -pie -o libtest.so.0d ./test-a.o test/./test-b.o -Wl,-z,relro -Wl,-z,now -lpthread -ldl
-/usr/bin/g++ -shared -fPIC -Wl,-z,relro -Wl,-z,now -o libtest-6.1.so.0 test.o -ltiff -lz
+/usr/bin/g++ -shared -fpic -Wl,-z,relro -Wl,-z,now -o libtest-6.1.so.0 test.o -ltiff -lz

diff --git a/t/tests.t b/t/tests.t
index b94d9766087ce86b111dfe3aa985cfbc2a58eb8b..485752a79755415a6d2cd143e1979d56b4b1626c 100644 (file)
--- a/t/tests.t
+++ b/t/tests.t
@@ -288,7 +288,7 @@ LDFLAGS missing (-Wl,-z,now): gcc -shared -fPIC -DPIC libtest.o -lpthread -O2 -W
 LDFLAGS missing (-Wl,-z,relro -Wl,-z,now): gcc -shared -fPIC -DPIC libtest.o -lpthread -O2 -Wl,--as-needed -o libtest.so
 LDFLAGS missing (-Wl,-z,now): gcc -shared -fPIC test.o -Wl,-z -Wl,relro -o .libs/libtest.so.1.0.0
 LDFLAGS missing (-Wl,-z,relro -fPIE -pie): gcc -shared -o libtest.so.0d ./test-a.o test/./test-b.o -Wl,-z,now -lpthread -ldl
-LDFLAGS missing (-Wl,-z,relro -Wl,-z,now): /usr/bin/g++ -shared -fPIC -o libtest-6.1.so.0 test.o -ltiff -lz
+LDFLAGS missing (-Wl,-z,relro -Wl,-z,now): /usr/bin/g++ -shared -fpic -o libtest-6.1.so.0 test.o -ltiff -lz
 ";