diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-05-19 09:37:00 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-05-19 09:37:00 -0300 |
| commit | 1d71a6315396f6e1cc79a1d7ecca0a559929230a (patch) | |
| tree | 706ef6d4ec2939584ce4673c44e736454a2bc1f0 | |
| parent | 9aa4965cdf59279c74a768e429f4155a00fea5e2 (diff) | |
| download | glibc-1d71a6315396f6e1cc79a1d7ecca0a559929230a.tar.gz glibc-1d71a6315396f6e1cc79a1d7ecca0a559929230a.tar.xz glibc-1d71a6315396f6e1cc79a1d7ecca0a559929230a.zip | |
Fix makefile rules for vmsplice, splice, and open_by_handle_at
Commits ecade1c, afbbc18, and a5a34d2 added compiler flags for vmsplice, splice, and open_by_handle_at respectively on default misc/Makefile. However such symbols are build only for Linux and the rules should on linux Makefile only. Checked on x86_64-linux-gnu. * misc/Makefile (CFLAGS-vmsplice.c): Remove rule. (CFLAGS-splice.c): Likewise. (CFLAGS-open_by_handle_at.c): Likewise. * sysdeps/unix/sysv/linux/Makefile (CFLAGS-vmsplice.c): New rule. (CFLAGS-splice.c): Likewise. (CFLAGS-open_by_handle_at.c): Likewise.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | misc/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index edeed506fe..3c8d9f14d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2017-05-19 Adhemerval Zanella <adhemerval.zanella@linaro.org> + + * misc/Makefile (CFLAGS-vmsplice.c): Remove rule. + (CFLAGS-splice.c): Likewise. + (CFLAGS-open_by_handle_at.c): Likewise. + * sysdeps/unix/sysv/linux/Makefile (CFLAGS-vmsplice.c): New rule. + (CFLAGS-splice.c): Likewise. + (CFLAGS-open_by_handle_at.c): Likewise. + 2017-05-19 Joseph Myers <joseph@codesourcery.com> * scripts/versions.awk: Generate ldbl-compat-choose.h. diff --git a/misc/Makefile b/misc/Makefile index 38beb00d8e..2db1fd8397 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -111,9 +111,6 @@ CFLAGS-tst-tsearch.c = $(stack-align-test-flags) CFLAGS-msync.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-fdatasync.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-fsync.c = -fexceptions -fasynchronous-unwind-tables -CFLAGS-vmsplice.c = -fexceptions -fasynchronous-unwind-tables -CFLAGS-splice.c = -fexceptions -fasynchronous-unwind-tables -CFLAGS-open_by_handle_at.c = -fexceptions -fasynchronous-unwind-tables # Called during static library initialization, so turn stack-protection # off for non-shared builds. diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 45c05f1029..fc6b3a9612 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -22,6 +22,9 @@ sysdep_routines += clone umount umount2 readahead \ CFLAGS-gethostid.c = -fexceptions CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables +CFLAGS-vmsplice.c = -fexceptions -fasynchronous-unwind-tables +CFLAGS-splice.c = -fexceptions -fasynchronous-unwind-tables +CFLAGS-open_by_handle_at.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=(0x80000000-sysconf(_SC_PAGESIZE))" # Note that bits/mman-linux.h is listed here though the file lives in the |