Fix include paths in include/bits/types/*.h.

Various include/bits/types/*.h files do

where the path specified is relative to the toplevel glibc source
directory.

That has the wrong number of ../ components to achieve the desired
effect; it actually searches relative to include/ for a file that does
not exist there, then goes on to search the #include <> paths
specified with -I, eventually finding the desired file via such a path
(e.g. sysdeps/nptl/) with the right number of directory components.
Before that it searches include/../.. because of the -Iinclude,
meaning that an appropriately named file outside the glibc source tree
can affect the build.

This patch changes all those files to do #include <path> without the
../../, as some such files already do.

Tested for x86_64.

	* include/bits/types/clock_t.h: Use #include <path> instead of
	#include "../../path".
	* include/bits/types/clockid_t.h: Likewise.
	* include/bits/types/struct_iovec.h: Likewise.
	* include/bits/types/struct_itimerspec.h: Likewise.
	* include/bits/types/struct_osockaddr.h: Likewise.
	* include/bits/types/struct_sigstack.h: Likewise.
	* include/bits/types/struct_timespec.h: Likewise.
	* include/bits/types/struct_timeval.h: Likewise.
	* include/bits/types/struct_tm.h: Likewise.
	* include/bits/types/time_t.h: Likewise.
	* include/bits/types/timer_t.h: Likewise.
This commit is contained in:
Joseph Myers 2017-06-07 17:59:50 +00:00
parent bd6193907a
commit 81df4d253d
12 changed files with 24 additions and 11 deletions

View File

@ -1,5 +1,18 @@
2017-06-07 Joseph Myers <joseph@codesourcery.com>
* include/bits/types/clock_t.h: Use #include <path> instead of
#include "../../path".
* include/bits/types/clockid_t.h: Likewise.
* include/bits/types/struct_iovec.h: Likewise.
* include/bits/types/struct_itimerspec.h: Likewise.
* include/bits/types/struct_osockaddr.h: Likewise.
* include/bits/types/struct_sigstack.h: Likewise.
* include/bits/types/struct_timespec.h: Likewise.
* include/bits/types/struct_timeval.h: Likewise.
* include/bits/types/struct_tm.h: Likewise.
* include/bits/types/time_t.h: Likewise.
* include/bits/types/timer_t.h: Likewise.
[BZ #14096]
* timezone/Makefile ($(objpfx)tst-timezone.out): Depend on
America/New_York.

View File

@ -1 +1 @@
#include "../../time/bits/types/clock_t.h"
#include <time/bits/types/clock_t.h>

View File

@ -1 +1 @@
#include "../../time/bits/types/clockid_t.h"
#include <time/bits/types/clockid_t.h>

View File

@ -1 +1 @@
#include "../../misc/bits/types/struct_iovec.h"
#include <misc/bits/types/struct_iovec.h>

View File

@ -1 +1 @@
#include "../../time/bits/types/struct_itimerspec.h"
#include <time/bits/types/struct_itimerspec.h>

View File

@ -1 +1 @@
#include "../../socket/bits/types/struct_osockaddr.h"
#include <socket/bits/types/struct_osockaddr.h>

View File

@ -1 +1 @@
#include "../../signal/bits/types/struct_sigstack.h"
#include <signal/bits/types/struct_sigstack.h>

View File

@ -1 +1 @@
#include "../../time/bits/types/struct_timespec.h"
#include <time/bits/types/struct_timespec.h>

View File

@ -1 +1 @@
#include "../../time/bits/types/struct_timeval.h"
#include <time/bits/types/struct_timeval.h>

View File

@ -1 +1 @@
#include "../../time/bits/types/struct_tm.h"
#include <time/bits/types/struct_tm.h>

View File

@ -1 +1 @@
#include "../../time/bits/types/time_t.h"
#include <time/bits/types/time_t.h>

View File

@ -1 +1 @@
#include "../../time/bits/types/timer_t.h"
#include <time/bits/types/timer_t.h>