← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to ports/sysdeps/unix/sysv/linux/arm/Makefile

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ports/sysdeps/unix/sysv/linux/arm/Makefile
32
32
 
33
33
# Add a syscall function to each library that needs one.
34
34
 
 
35
ifeq ($(subdir),crypt)
 
36
libcrypt-sysdep_routines += libc-do-syscall
 
37
endif
 
38
 
35
39
ifeq ($(subdir),rt)
36
40
librt-sysdep_routines += libc-do-syscall
37
41
librt-shared-only-routines += libc-do-syscall
66
70
LDFLAGS-tst-rfc3484-3 += $(common-objpfx)csu/libc-do-syscall.o
67
71
endif
68
72
 
69
 
define default-abi-prog
70
 
echo '#ifdef __ARM_PCS_VFP';
71
 
echo 'hard';
72
 
echo '#else';
73
 
echo 'soft';
74
 
echo '#endif'
75
 
endef
76
 
default-abi := $(strip $(shell \
77
 
    ($(default-abi-prog)) | $(CC) $(CFLAGS) $(CPPFLAGS) -E -P -))
78
 
ifeq ($(default-abi),hard)
79
 
# OK.
80
 
else
81
 
ifneq ($(default-abi),soft)
82
 
Unknown ABI, must be "hard" or "soft".
83
 
endif
 
73
# Get value of default-abi.
 
74
include $(common-objpfx)default-abi.make
 
75
 
 
76
abi-variants := soft hard
 
77
 
 
78
ifeq (,$(filter $(default-abi),$(abi-variants)))
 
79
Unknown ABI, must be one of $(abi-variants)
84
80
endif
85
81
 
86
82
abi-includes :=
87
 
abi-variants := soft hard
88
83
abi-soft-options := -U__ARM_PCS_VFP
89
84
abi-soft-condition := !defined __ARM_PCS_VFP
90
85
abi-soft-ld-soname := ld-linux.so.3