|
 |
0e6352 |
diff --git a/annocheck/hardened.c b/annocheck/hardened.c
|
|
|
0e6352 |
index d41c740..83645a7 100644
|
|
|
0e6352 |
--- a/annocheck/hardened.c
|
|
|
0e6352 |
+++ b/annocheck/hardened.c
|
|
|
0e6352 |
@@ -3523,8 +3523,12 @@ finish (annocheck_data * data)
|
|
|
0e6352 |
case TEST_STACK_PROT:
|
|
|
0e6352 |
if (per_file.current_tool == TOOL_GO)
|
|
|
0e6352 |
skip (data, i, SOURCE_FINAL_SCAN, "GO is stack safe");
|
|
|
0e6352 |
+ else if (per_file.seen_tools == TOOL_GAS
|
|
|
0e6352 |
+ || (per_file.gcc_from_comment && per_file.seen_tools == (TOOL_GAS | TOOL_GCC)))
|
|
|
0e6352 |
+ skip (data, i, SOURCE_FINAL_SCAN, "no compiled code found");
|
|
|
0e6352 |
else if (is_C_compiler (per_file.seen_tools))
|
|
|
0e6352 |
- maybe (data, i, SOURCE_FINAL_SCAN, "no valid notes found regarding this test");
|
|
|
0e6352 |
+ /* The skip is necessary because some glibc code is built this way. */
|
|
|
0e6352 |
+ skip (data, i, SOURCE_FINAL_SCAN, "no notes found regarding this feature");
|
|
|
0e6352 |
else
|
|
|
0e6352 |
skip (data, i, SOURCE_FINAL_SCAN, "not compiled code");
|
|
|
0e6352 |
break;
|
|
|
0e6352 |
diff --git a/tests/glibc-notes-test b/tests/glibc-notes-test
|
|
|
0e6352 |
index ab9e639..8496af8 100755
|
|
|
0e6352 |
--- a/tests/glibc-notes-test
|
|
|
0e6352 |
+++ b/tests/glibc-notes-test
|
|
|
0e6352 |
@@ -31,7 +31,7 @@ $GCC -pie -Wl,-z,now hello.o hello2.o hello3.o -L. -lhello -o glibc-notes.exe
|
|
|
0e6352 |
|
|
|
0e6352 |
# Run annocheck
|
|
|
0e6352 |
|
|
|
0e6352 |
-$ANNOCHECK glibc-notes.exe --skip-cf-protection --skip-property-note --ignore-gaps > glibc-notes.out
|
|
|
0e6352 |
+$ANNOCHECK glibc-notes.exe --skip-cf-protection --skip-property-note --skip-stack-realign --ignore-gaps > glibc-notes.out
|
|
|
0e6352 |
grep -e "PASS" glibc-notes.out
|
|
|
0e6352 |
if [ $? != 0 ];
|
|
|
0e6352 |
then
|