[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r23422 - in /trunk: ./ libc/ libc/dlfcn/ libc/elf/ libc/include/ libc/locale/ libc/locale/programs/ libc/manual/ libc/misc/ ...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r23422 - in /trunk: ./ libc/ libc/dlfcn/ libc/elf/ libc/include/ libc/locale/ libc/locale/programs/ libc/manual/ libc/misc/ ...
- From: joseph@xxxxxxxxxx
- Date: Tue, 02 Jul 2013 00:11:46 -0000
Author: joseph
Date: Tue Jul 2 00:11:45 2013
New Revision: 23422
Log:
Merge changes between r23363 and r23421 from /fsf/trunk.
Added:
trunk/libc/dlfcn/modstatic3.c
- copied unchanged from r23421, fsf/trunk/libc/dlfcn/modstatic3.c
trunk/libc/dlfcn/modstatic5.c
- copied unchanged from r23421, fsf/trunk/libc/dlfcn/modstatic5.c
trunk/libc/dlfcn/tststatic3.c
- copied unchanged from r23421, fsf/trunk/libc/dlfcn/tststatic3.c
trunk/libc/dlfcn/tststatic4.c
- copied unchanged from r23421, fsf/trunk/libc/dlfcn/tststatic4.c
trunk/libc/dlfcn/tststatic5.c
- copied unchanged from r23421, fsf/trunk/libc/dlfcn/tststatic5.c
trunk/libc/ports/sysdeps/alpha/fpu/e_sqrtf.c
- copied unchanged from r23421, fsf/trunk/libc/ports/sysdeps/alpha/fpu/e_sqrtf.c
trunk/libc/sysdeps/generic/libc-mmap.h
- copied unchanged from r23421, fsf/trunk/libc/sysdeps/generic/libc-mmap.h
trunk/libc/sysdeps/powerpc/powerpc32/power8/
- copied from r23421, fsf/trunk/libc/sysdeps/powerpc/powerpc32/power8/
trunk/libc/sysdeps/powerpc/powerpc64/power8/
- copied from r23421, fsf/trunk/libc/sysdeps/powerpc/powerpc64/power8/
trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/power8/
- copied from r23421, fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/power8/
trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/power8/
- copied from r23421, fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/power8/
Removed:
trunk/libc/ports/sysdeps/tile/fegetenv.c
trunk/libc/ports/sysdeps/tile/fegetround.c
trunk/libc/ports/sysdeps/tile/feholdexcpt.c
trunk/libc/ports/sysdeps/tile/fesetenv.c
trunk/libc/ports/sysdeps/tile/fesetround.c
trunk/libc/ports/sysdeps/tile/feupdateenv.c
Modified:
trunk/ (props changed)
trunk/libc/ChangeLog
trunk/libc/INSTALL
trunk/libc/NEWS
trunk/libc/configure
trunk/libc/configure.in
trunk/libc/dlfcn/Makefile
trunk/libc/elf/dl-load.c
trunk/libc/elf/dl-open.c
trunk/libc/elf/dl-profile.c
trunk/libc/elf/dl-support.c
trunk/libc/elf/dl-sysdep.c
trunk/libc/elf/elf.h
trunk/libc/include/libc-internal.h
trunk/libc/locale/locarchive.h
trunk/libc/locale/programs/locarchive.c
trunk/libc/manual/install.texi
trunk/libc/manual/texinfo.tex
trunk/libc/misc/getauxval.c
trunk/libc/nptl/ChangeLog
trunk/libc/nptl/pthread_exit.c
trunk/libc/nscd/connections.c
trunk/libc/ports/ChangeLog.aarch64
trunk/libc/ports/ChangeLog.alpha
trunk/libc/ports/ChangeLog.arm
trunk/libc/ports/ChangeLog.ia64
trunk/libc/ports/ChangeLog.m68k
trunk/libc/ports/ChangeLog.mips
trunk/libc/ports/ChangeLog.tile
trunk/libc/ports/sysdeps/aarch64/dl-machine.h
trunk/libc/ports/sysdeps/alpha/Versions
trunk/libc/ports/sysdeps/alpha/alphaev6/fpu/e_sqrt.S
trunk/libc/ports/sysdeps/alpha/alphaev6/fpu/e_sqrtf.S
trunk/libc/ports/sysdeps/alpha/dl-procinfo.h
trunk/libc/ports/sysdeps/alpha/fpu/e_sqrt.c
trunk/libc/ports/sysdeps/alpha/soft-fp/e_sqrtl.c
trunk/libc/ports/sysdeps/m68k/dl-trampoline.S
trunk/libc/ports/sysdeps/m68k/fpu_control.h
trunk/libc/ports/sysdeps/m68k/sysdep.h
trunk/libc/ports/sysdeps/mips/dl-procinfo.h
trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/getcontext.S
trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/nptl/libm.abilist
trunk/libc/ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/dl-static.c
trunk/libc/ports/sysdeps/unix/sysv/linux/mips/dl-static.c
trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data (props changed)
trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data (props changed)
trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data (props changed)
trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data (props changed)
trunk/libc/string/test-memcmp.c
trunk/libc/sysdeps/generic/dl-procinfo.h
trunk/libc/sysdeps/generic/ldsodefs.h
trunk/libc/sysdeps/i386/dl-procinfo.h
trunk/libc/sysdeps/powerpc/Makefile
trunk/libc/sysdeps/powerpc/bits/hwcap.h
trunk/libc/sysdeps/powerpc/dl-procinfo.c
trunk/libc/sysdeps/powerpc/dl-procinfo.h
trunk/libc/sysdeps/powerpc/rtld-global-offsets.sym
trunk/libc/sysdeps/s390/dl-procinfo.h
trunk/libc/sysdeps/sparc/dl-procinfo.h
trunk/libc/sysdeps/unix/sysv/linux/i386/dl-procinfo.h
trunk/libc/sysdeps/unix/sysv/linux/mmap64.c
trunk/libc/sysdeps/unix/sysv/linux/s390/dl-procinfo.h
trunk/libc/sysdeps/x86_64/multiarch/init-arch.c
trunk/libc/sysdeps/x86_64/multiarch/init-arch.h
trunk/libc/sysdeps/x86_64/multiarch/memcmp-ssse3.S
trunk/libc/sysdeps/x86_64/multiarch/strchr.S
trunk/libc/sysdeps/x86_64/multiarch/strcmp.S
trunk/libc/sysdeps/x86_64/multiarch/strrchr.S
Propchange: trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 2 00:11:45 2013
@@ -1,1 +1,1 @@
-/fsf/trunk:15224-23363
+/fsf/trunk:15224-23421
Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Tue Jul 2 00:11:45 2013
@@ -1,3 +1,196 @@
+2013-06-28 Liubov Dmitrieva <liubov.dmitrieva@xxxxxxxxx>
+
+ * sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features): Set
+ bit_Slow_SSE4_2 and bit_Prefer_PMINUB_for_stringop for Intel
+ Silvermont.
+ * sysdeps/x86_64/multiarch/init-arch.h (bit_Slow_SSE4_2): New
+ macro.
+ (index_Slow_SSE4_2): Likewise.
+ (index_Prefer_PMINUB_for_stringop): Likewise.
+ * sysdeps/x86_64/multiarch/strchr.S: Skip SSE4.2 version if
+ bit_Slow_SSE4_2 is set.
+ * sysdeps/x86_64/multiarch/strcmp.S: Likewise.
+ * sysdeps/x86_64/multiarch/strrchr.S: Likewise.
+
+2013-06-28 Ryan S. Arnold <rsa@xxxxxxxxxxxxxxxxxx>
+
+ * sysdeps/powerpc/Makefile: Add comment about generating an offset to
+ rtld_global._dl_hwcap2.
+ * sysdeps/powerpc/bits/hwcap.h: Added PPC_FEATURE2_* definitions for
+ POWER8.
+ * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_cap_flags): Extend for
+ POWER8 feature descriptions defined in _dl_hwcap2.
+ * sysdeps/powerpc/dl-procinfo.h (_dl_procinfo): Implement AT_HWCAP2
+ string handling for POWER8 feature bits.
+ (_DL_HWCAP_COUNT): Increment to 64 to cover AT_HWCAP2 bits.
+ (_DL_HWCAP_LAST): New definition for position of last AT_HWCAP bit in
+ _dl_powerpc_cap_flags.
+ (_DL_HWCAP2_LAST): New definition for last usable bit of AT_HWCAP2.
+ * sysdeps/powerpc/rtld-global-offsets.sym
+ (RTLD_GLOBAL_RO_DL_HWCAP2_OFFSET): New offset macro to locate
+ _dl_hwcap2 in the rtld_global_ro structure.
+
+2013-06-28 Ryan S. Arnold <rsa@xxxxxxxxxxxxxxxxxx>
+
+ * elf/dl-support.c (_dl_hwcap2): Add a new hwcap field for more
+ hardware capabilities in support of AT_HWCAP2.
+ (_dl_aux_init): Read AT_HWCAP2 into GLRO(dl_hwcap2).
+ * elf/dl-sysdep.c (_dl_sysdep_start): Read AT_HWCAP2 into
+ GLRO(dl_hwcap2).
+ (_dl_show_auxv): Add support for calling _dl_procinfo to display
+ AT_HWCAP2. If a platform doesn't chose to handle displaying AT_HWCAP2
+ explicitly the unknown a_type display mechanism is used.
+ * misc/getauxval.c (__getauxval): Return GLRO(dl_hwcap2) on AT_HWCAP2.
+ * sysdeps/generic/ldsodefs.h (rtld_global_ro): Add _dl_hwcap2 as a new
+ struct member.
+ * sysdeps/generic/dl-procinfo.h (_dl_procinfo): Add TYPE parameter
+ to macro prototype for AT_HWCAP2 support.
+ * sysdeps/i386/dl-procinfo.h: Likewise.
+ * sysdeps/s390/dl-procinfo.h: Likewise.
+ * sysdeps/powerpc/dl-procinfo.h (_dl_procinfo): Add TYPE parameter to
+ macro prototype for AT_HWCAP2 support. Make WORD unsigned long int
+ rather than signed int. Stub in handler for TYPE == AT_HWCAP2 to
+ return -1 for unknown a_type display fallback.
+ * sysdeps/sparc/dl-procinfo.h: Likewise.
+ * sysdeps/unix/sysv/linux/i386/dl-procinfo.h: Likewise.
+ * sysdeps/unix/sysv/linux/s390/dl-procinfo.h: Likewise.
+
+2013-06-28 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/mmap64.c (__mmap64): Shift by page_shift
+ instead of MMAP2_PAGE_SHIFT in call to INLINE_SYSCALL.
+
+2013-06-28 Pierre Ynard <linkfanel@xxxxxxxx>
+
+ [BZ #12492]
+ * elf/dl-load.c (_dl_map_object_from_fd): Test for failure of
+ mprotect making __stack_prot writable.
+
+2013-06-28 Nathan Froyd <froydnj@xxxxxxxxxxxxxxxx>
+ Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * elf/dl-profile.c (struct here_cg_arc_record): Declare 'count'
+ as being properly aligned.
+
+2013-06-28 Maciej W. Rozycki <macro@xxxxxxxxxxxxxxxx>
+
+ * dlfcn/modstatic5.c: New file.
+ * dlfcn/tststatic5.c: New file.
+ * dlfcn/Makefile (tests): Add tststatic5.
+ (tests-static): Likewise.
+ (modules-names): Add modstatic5.
+ (tststatic5-ENV): New variable.
+ ($(objpfx)tststatic5, $(objpfx)tststatic5.out): New dependencies.
+
+ [BZ #15022]
+ * elf/dl-support.c (_dl_main_map): New variable.
+ (_dl_ns): Use it to initialize [LM_ID_BASE] element.
+ (_dl_nns, _dl_load_adds): Set to 1.
+ (_dl_initial_searchlist): Refer to _dl_main_map.
+ (_dl_non_dynamic_init): Initialize _dl_main_map.l_origin.
+ * elf/dl-load.c (_dl_dst_substitute) [!SHARED]: Remove fallback
+ call to _dl_get_origin.
+ * elf/dl-open.c (dl_open_worker): Remove !SHARED special casing
+ around call_map.
+ (_dl_open) [!SHARED]: Remove code to initialize GL(dl_nns).
+ * dlfcn/modstatic3.c: New file.
+ * dlfcn/tststatic3.c: New file.
+ * dlfcn/tststatic4.c: New file.
+ * dlfcn/Makefile (tests): Add tststatic3 and tststatic4.
+ (tests-static): Likewise.
+ (modules-names): Add modstatic3.
+ (tststatic3-ENV, tststatic4-ENV): New variables.
+ ($(objpfx)tststatic3, $(objpfx)tststatic3.out): New dependencies.
+ ($(objpfx)tststatic4, $(objpfx)tststatic4.out): Likewise.
+
+2013-06-26 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * configure.in (CC): Require GCC version 4.4 or later.
+ * configure: Regenerated.
+ * manual/install.texi (Tools for Compilation): Update GCC version
+ requirement.
+ * INSTALL: Regenerated.
+
+2013-06-26 Liubov Dmitrieva <liubov.dmitrieva@xxxxxxxxx>
+
+ [BZ #15674]
+ * string/test-memcmp.c (check2): New.
+ (main): Call check2.
+
+ * sysdeps/x86_64/multiarch/memcmp-ssse3.S: Fix buffers overrun.
+
+2013-06-26 Maciej W. Rozycki <macro@xxxxxxxxxxxxxxxx>
+
+ [BZ #15022]
+ * elf/dl-open.c (_dl_open) [!SHARED]: Move call to DL_STATIC_INIT
+ over to...
+ (dl_open_worker) [!SHARED]: ... here.
+
+2013-06-26 Ryan S. Arnold <rsa@xxxxxxxxxxxxxxxxxx>
+
+ * elf/elf.h (AT_HWCAP2): Add a new a_type entry.
+
+2013-06-25 Richard Henderson <rth@xxxxxxxxxx>
+
+ * locale/programs/locarchive.c: Include <libc-internal.h>
+
+2013-06-25 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * manual/texinfo.tex: Update to version 2013-06-21.17, with
+ trailing whitespace removed.
+
+2013-06-24 Mike Frysinger <vapier@xxxxxxxxxx>
+
+ [BZ #10283]
+ * locale/locarchive.h (struct locarhandle): Add mmap_base and mmap_len.
+ * locale/programs/locarchive.c: Include libc-mmap.h.
+ (prepare_address_space): Take two new outputs (the mmap base and len).
+ Align p to MAP_FIXED_ALIGNMENT. Set mmap base and len to the right
+ values.
+ (create_archive): Declare new mmap base and len values for
+ prepare_address_space, and store the result in ah.
+ (file_data_available_p): Replace pagesz with MAP_FIXED_ALIGNMENT.
+ (enlarge_archive): If ah->mmap_base is not NULL, use that and
+ ah->mmap_len to unmap rather than ah->addr and ah->reserved.
+ Declare new mmap base and len values for
+ prepare_address_space, and store the result in new_ah.
+ (open_archive): Declare new mmap base and len values for
+ prepare_address_space, and store the result in ah.
+ (close_archive): If ah->mmap_base is not NULL, use that and
+ ah->mmap_len to unmap rather than ah->addr and ah->reserved.
+ * sysdeps/generic/libc-mmap.h: New file.
+
+2013-06-24 Mike Frysinger <vapier@xxxxxxxxxx>
+
+ * include/libc-internal.h (ALIGN_DOWN): New helper macro.
+ (ALIGN_UP): Likewise.
+ (PTR_ALIGN_DOWN): Likewise.
+ (PTR_ALIGN_UP): Likewise.
+
+2013-06-24 Ryan S. Arnold <rsa@xxxxxxxxxxxxxxxxxx>
+
+ * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platforms): Add "power8"
+ entry mapped to PPC_PLATFORM_POWER8.
+ * sysdeps/powerpc/dl-procinfo.h (_DL_PLATFORMS_COUNT): Increment for
+ POWER8.
+ (PPC_PLATFORM_POWER8): Add new platform bit for POWER8 processor.
+ (_dl_string_platform): Add case for exporting platform position for
+ POWER8.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/power8/Implies: Chain
+ search path to sysdeps/powerpc/powerpc32/power8 directory.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc64/power8/Implies: Chain
+ search path to sysdeps/powerpc/powerpc64/power8 directory.
+ * sysdeps/powerpc/powerpc32/power8/Implies: Chain search path to
+ power7 directories.
+ * sysdeps/powerpc/powerpc64/power8/Implies: Chain search path to
+ power7 directories.
+
+2013-06-24 Siddhesh Poyarekar <siddhesh@xxxxxxxxxx>
+
+ * INSTALL: Regenerate.
+
+ * nscd/connections.c (nscd_init): Fix comment.
+
2013-06-22 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* sysdeps/unix/sysv/linux/libc_fatal.c: Include <string.h>.
Modified: trunk/libc/INSTALL
==============================================================================
--- trunk/libc/INSTALL (original)
+++ trunk/libc/INSTALL Tue Jul 2 00:11:45 2013
@@ -327,9 +327,9 @@
recommend GNU `make' version 3.79. All earlier versions have
severe bugs or lack features.
- * GCC 4.3 or newer, GCC 4.6 recommended
-
- GCC 4.3 or higher is required; as of this writing, GCC 4.6 is the
+ * GCC 4.4 or newer, GCC 4.6 recommended
+
+ GCC 4.4 or higher is required; as of this writing, GCC 4.6 is the
compiler we advise to use to build the GNU C Library.
You can use whatever compiler you like to compile programs that use
@@ -352,10 +352,11 @@
installation mechanism for the info files is not present or works
differently.
- * GNU `awk' 3.0, or higher
-
- `Awk' is used in several places to generate files. `gawk' 3.0 is
- known to work.
+ * GNU `awk' 3.1.2, or higher
+
+ `awk' is used in several places to generate files. Some `gawk'
+ extensions are used, including the `asorti' function, which was
+ introduced in version 3.1.2 of `gawk'.
* Perl 5
Modified: trunk/libc/NEWS
==============================================================================
--- trunk/libc/NEWS (original)
+++ trunk/libc/NEWS Tue Jul 2 00:11:45 2013
@@ -9,19 +9,19 @@
* The following bugs are resolved with this release:
- 2546, 2560, 5159, 6809, 7006, 10060, 10062, 10357, 10686, 11120, 11561,
- 12387, 12515, 12723, 13550, 13889, 13951, 13988, 14142, 14176, 14200,
- 14256, 14280, 14293, 14317, 14327, 14478, 14496, 14582, 14686, 14812,
- 14888, 14894, 14907, 14908, 14909, 14920, 14952, 14964, 14981, 14982,
- 14985, 14991, 14994, 14996, 15000, 15003, 15006, 15007, 15014, 15020,
- 15023, 15036, 15054, 15055, 15062, 15078, 15084, 15085, 15086, 15100,
- 15160, 15214, 15221, 15232, 15234, 15283, 15285, 15287, 15304, 15305,
- 15307, 15309, 15327, 15330, 15335, 15336, 15337, 15339, 15342, 15346,
- 15359, 15361, 15366, 15380, 15381, 15394, 15395, 15405, 15406, 15409,
- 15416, 15418, 15419, 15423, 15424, 15426, 15429, 15431, 15432, 15441,
- 15442, 15448, 15465, 15480, 15485, 15488, 15490, 15492, 15493, 15497,
- 15506, 15529, 15536, 15553, 15577, 15583, 15618, 15627, 15631, 15654,
- 15655, 15667.
+ 2546, 2560, 5159, 6809, 7006, 10060, 10062, 10283, 10357, 10686, 11120,
+ 11561, 12310, 12387, 12492, 12515, 12723, 13550, 13889, 13951, 13988,
+ 14142, 14176, 14200, 14256, 14280, 14293, 14317, 14327, 14478, 14496,
+ 14582, 14686, 14812, 14888, 14894, 14907, 14908, 14909, 14920, 14952,
+ 14964, 14981, 14982, 14985, 14991, 14994, 14996, 15000, 15003, 15006,
+ 15007, 15014, 15020, 15022, 15023, 15036, 15054, 15055, 15062, 15078,
+ 15084, 15085, 15086, 15100, 15160, 15214, 15221, 15232, 15234, 15283,
+ 15285, 15287, 15304, 15305, 15307, 15309, 15327, 15330, 15335, 15336,
+ 15337, 15339, 15342, 15346, 15359, 15361, 15366, 15380, 15381, 15394,
+ 15395, 15405, 15406, 15409, 15416, 15418, 15419, 15423, 15424, 15426,
+ 15429, 15431, 15432, 15441, 15442, 15448, 15465, 15480, 15485, 15488,
+ 15490, 15492, 15493, 15497, 15506, 15529, 15536, 15553, 15577, 15583,
+ 15618, 15627, 15631, 15654, 15655, 15666, 15667, 15674.
* CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
#15078).
@@ -38,6 +38,21 @@
* Support for priority inherited mutexes in pthread condition variables on
non-x86 architectures.
+
+* Port to Xilinx MicroBlaze contributed by David Holsgrove.
+
+* Optimized string functions for AArch64. Implemented by Marcus Shawcroft.
+
+* Optimized string functions for ARM. Implemented by Will Newton and
+ Richard Henderson.
+
+* Optimized libm functions for SPARC. Implemented by David S. Miller.
+
+* Support for building more of ARM glibc as Thumb-2 code. Implemented by
+ Richard Henderson.
+
+* Support for building most of MIPS glibc as MIPS16 code. Implemented by
+ Chung-Lin Tang, Maciej W. Rozycki and Maxim Kuvyrkov.
* Added a benchmark framework to track performance of functions in glibc.
Modified: trunk/libc/configure
==============================================================================
--- trunk/libc/configure (original)
+++ trunk/libc/configure Tue Jul 2 00:11:45 2013
@@ -4678,7 +4678,7 @@
ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- 4.[3-9].* | 4.[1-9][0-9].* | [5-9].* )
+ 4.[4-9].* | 4.[1-9][0-9].* | [5-9].* )
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
Modified: trunk/libc/configure.in
==============================================================================
--- trunk/libc/configure.in (original)
+++ trunk/libc/configure.in Tue Jul 2 00:11:45 2013
@@ -966,7 +966,7 @@
# These programs are version sensitive.
AC_CHECK_TOOL_PREFIX
AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
- [version \([egcygnustpi-]*[0-9.]*\)], [4.[3-9].* | 4.[1-9][0-9].* | [5-9].* ],
+ [version \([egcygnustpi-]*[0-9.]*\)], [4.[4-9].* | 4.[1-9][0-9].* | [5-9].* ],
critic_missing="$critic_missing gcc")
AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
[GNU Make[^0-9]*\([0-9][0-9.]*\)],
Modified: trunk/libc/dlfcn/Makefile
==============================================================================
--- trunk/libc/dlfcn/Makefile (original)
+++ trunk/libc/dlfcn/Makefile Tue Jul 2 00:11:45 2013
@@ -51,11 +51,14 @@
errmsg1mod.so-no-z-defs = yes
ifeq (yes,$(build-shared))
-tests += tststatic tststatic2
-tests-static += tststatic tststatic2
-modules-names += modstatic modstatic2
+tests += tststatic tststatic2 tststatic3 tststatic4 tststatic5
+tests-static += tststatic tststatic2 tststatic3 tststatic4 tststatic5
+modules-names += modstatic modstatic2 modstatic3 modstatic5
tststatic-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)elf
tststatic2-ENV = $(tststatic-ENV)
+tststatic3-ENV = $(tststatic-ENV)
+tststatic4-ENV = $(tststatic-ENV)
+tststatic5-ENV = $(tststatic-ENV)
endif
extra-test-objs += $(modules-names:=.os)
@@ -108,6 +111,15 @@
$(objpfx)modstatic2.so: $(libdl)
+$(objpfx)tststatic3: $(objpfx)libdl.a
+$(objpfx)tststatic3.out: $(objpfx)tststatic3 $(objpfx)modstatic3.so
+
+$(objpfx)tststatic4: $(objpfx)libdl.a
+$(objpfx)tststatic4.out: $(objpfx)tststatic4 $(objpfx)modstatic3.so
+
+$(objpfx)tststatic5: $(objpfx)libdl.a
+$(objpfx)tststatic5.out: $(objpfx)tststatic5 $(objpfx)modstatic5.so
+
$(objpfx)bug-dlopen1: $(libdl)
$(objpfx)bug-dlsym1: $(libdl) $(objpfx)bug-dlsym1-lib2.so
Modified: trunk/libc/elf/dl-load.c
==============================================================================
--- trunk/libc/elf/dl-load.c (original)
+++ trunk/libc/elf/dl-load.c Tue Jul 2 00:11:45 2013
@@ -342,13 +342,7 @@
if ((len = is_dst (start, name, "ORIGIN", is_path,
INTUSE(__libc_enable_secure))) != 0)
{
-#ifndef SHARED
- if (l == NULL)
- repl = _dl_get_origin ();
- else
-#endif
- repl = l->l_origin;
-
+ repl = l->l_origin;
check_for_trusted = (INTUSE(__libc_enable_secure)
&& l->l_type == lt_executable);
}
@@ -1495,7 +1489,7 @@
/* The variable lies in the region protected by RELRO. */
if (__mprotect ((void *) p, s, PROT_READ|PROT_WRITE) < 0)
{
- errstring = N_("cannot change memory protection");
+ errstring = N_("cannot change memory protections");
goto call_lose_errno;
}
__stack_prot |= PROT_READ|PROT_WRITE|PROT_EXEC;
Modified: trunk/libc/elf/dl-open.c
==============================================================================
--- trunk/libc/elf/dl-open.c (original)
+++ trunk/libc/elf/dl-open.c Tue Jul 2 00:11:45 2013
@@ -204,11 +204,9 @@
{
const void *caller_dlopen = args->caller_dlopen;
-#ifdef SHARED
/* We have to find out from which object the caller is calling.
By default we assume this is the main application. */
call_map = GL(dl_ns)[LM_ID_BASE]._ns_loaded;
-#endif
struct link_map *l = _dl_find_dso_for_object ((ElfW(Addr)) caller_dlopen);
@@ -216,15 +214,7 @@
call_map = l;
if (args->nsid == __LM_ID_CALLER)
- {
-#ifndef SHARED
- /* In statically linked apps there might be no loaded object. */
- if (call_map == NULL)
- args->nsid = LM_ID_BASE;
- else
-#endif
- args->nsid = call_map->l_ns;
- }
+ args->nsid = call_map->l_ns;
}
assert (_dl_debug_initialize (0, args->nsid)->r_state == RT_CONSISTENT);
@@ -568,6 +558,10 @@
if (relocation_in_progress)
LIBC_PROBE (reloc_complete, 3, args->nsid, r, new);
+#ifndef SHARED
+ DL_STATIC_INIT (new);
+#endif
+
/* Run the initializer functions of new objects. */
_dl_init (new, args->argc, args->argv, args->env);
@@ -638,12 +632,6 @@
|| GL(dl_ns)[nsid]._ns_loaded->l_auditing))
_dl_signal_error (EINVAL, file, NULL,
N_("invalid target namespace in dlmopen()"));
-#ifndef SHARED
- else if ((nsid == LM_ID_BASE || nsid == __LM_ID_CALLER)
- && GL(dl_ns)[LM_ID_BASE]._ns_loaded == NULL
- && GL(dl_nns) == 0)
- GL(dl_nns) = 1;
-#endif
struct dl_open_args args;
args.file = file;
@@ -721,10 +709,6 @@
/* Release the lock. */
__rtld_lock_unlock_recursive (GL(dl_load_lock));
-#ifndef SHARED
- DL_STATIC_INIT (args.map);
-#endif
-
return args.map;
}
Modified: trunk/libc/elf/dl-profile.c
==============================================================================
--- trunk/libc/elf/dl-profile.c (original)
+++ trunk/libc/elf/dl-profile.c Tue Jul 2 00:11:45 2013
@@ -131,7 +131,18 @@
{
uintptr_t from_pc;
uintptr_t self_pc;
- uint32_t count __attribute__((aligned(__alignof__(uint32_t))));
+ /* The count field is atomically incremented in _dl_mcount, which
+ requires it to be properly aligned for its type, and for this
+ alignment to be visible to the compiler. The amount of data
+ before an array of this structure is calculated as
+ expected_size in _dl_start_profile. Everything in that
+ calculation is a multiple of 4 bytes (in the case of
+ kcountsize, because it is derived from a subtraction of
+ page-aligned values, and the corresponding calculation in
+ __monstartup also ensures it is at least a multiple of the size
+ of u_long), so all copies of this field do in fact have the
+ appropriate alignment. */
+ uint32_t count __attribute__ ((aligned (__alignof__ (uint32_t))));
} __attribute__ ((packed));
static struct here_cg_arc_record *data;
Modified: trunk/libc/elf/dl-support.c
==============================================================================
--- trunk/libc/elf/dl-support.c (original)
+++ trunk/libc/elf/dl-support.c Tue Jul 2 00:11:45 2013
@@ -73,17 +73,52 @@
/* Nonzero if runtime lookup should not update the .got/.plt. */
int _dl_bind_not;
+/* A dummy link map for the executable, used by dlopen to access the global
+ scope. We don't export any symbols ourselves, so this can be minimal. */
+static struct link_map _dl_main_map =
+ {
+ .l_name = (char *) "",
+ .l_real = &_dl_main_map,
+ .l_ns = LM_ID_BASE,
+ .l_libname = &(struct libname_list) { .name = "", .dont_free = 1 },
+ .l_searchlist =
+ {
+ .r_list = &(struct link_map *) { &_dl_main_map },
+ .r_nlist = 1,
+ },
+ .l_symbolic_searchlist = { .r_list = &(struct link_map *) { NULL } },
+ .l_type = lt_executable,
+ .l_scope_mem = { &_dl_main_map.l_searchlist },
+ .l_scope_max = (sizeof (_dl_main_map.l_scope_mem)
+ / sizeof (_dl_main_map.l_scope_mem[0])),
+ .l_scope = _dl_main_map.l_scope_mem,
+ .l_local_scope = { &_dl_main_map.l_searchlist },
+ .l_used = 1,
+ .l_tls_offset = NO_TLS_OFFSET,
+ .l_serial = 1,
+ };
+
/* Namespace information. */
-struct link_namespaces _dl_ns[DL_NNS];
-size_t _dl_nns;
+struct link_namespaces _dl_ns[DL_NNS] =
+ {
+ [LM_ID_BASE] =
+ {
+ ._ns_loaded = &_dl_main_map,
+ ._ns_nloaded = 1,
+ ._ns_main_searchlist = &_dl_main_map.l_searchlist,
+ }
+ };
+size_t _dl_nns = 1;
/* Incremented whenever something may have been added to dl_loaded. */
-unsigned long long _dl_load_adds;
-
-/* Fake scope. In dynamically linked binaries this is the scope of the
- main application but here we don't have something like this. So
- create a fake scope containing nothing. */
-struct r_scope_elem _dl_initial_searchlist;
+unsigned long long _dl_load_adds = 1;
+
+/* Fake scope of the main application. */
+struct r_scope_elem _dl_initial_searchlist =
+ {
+ .r_list = &(struct link_map *) { &_dl_main_map },
+ .r_nlist = 1,
+ };
#ifndef HAVE_INLINED_SYSCALLS
/* Nonzero during startup. */
@@ -133,6 +168,7 @@
const ElfW(Phdr) *_dl_phdr;
size_t _dl_phnum;
uint64_t _dl_hwcap __attribute__ ((nocommon));
+uint64_t _dl_hwcap2 __attribute__ ((nocommon));
/* This is not initialized to HWCAP_IMPORTANT, matching the definition
of _dl_important_hwcaps, below, where no hwcap strings are ever
@@ -216,6 +252,9 @@
break;
case AT_HWCAP:
GLRO(dl_hwcap) = (unsigned long int) av->a_un.a_val;
+ break;
+ case AT_HWCAP2:
+ GLRO(dl_hwcap2) = (unsigned long int) av->a_un.a_val;
break;
#ifdef NEED_DL_SYSINFO
case AT_SYSINFO:
@@ -268,6 +307,8 @@
internal_function
_dl_non_dynamic_init (void)
{
+ _dl_main_map.l_origin = _dl_get_origin ();
+
if (HP_TIMING_AVAIL)
HP_TIMING_NOW (_dl_cpuclock_offset);
Modified: trunk/libc/elf/dl-sysdep.c
==============================================================================
--- trunk/libc/elf/dl-sysdep.c (original)
+++ trunk/libc/elf/dl-sysdep.c Tue Jul 2 00:11:45 2013
@@ -155,6 +155,9 @@
break;
case AT_HWCAP:
GLRO(dl_hwcap) = (unsigned long int) av->a_un.a_val;
+ break;
+ case AT_HWCAP2:
+ GLRO(dl_hwcap2) = (unsigned long int) av->a_un.a_val;
break;
case AT_CLKTCK:
GLRO(dl_clktck) = av->a_un.a_val;
@@ -303,6 +306,7 @@
[AT_SYSINFO - 2] = { "SYSINFO: 0x", hex },
[AT_SYSINFO_EHDR - 2] = { "SYSINFO_EHDR: 0x", hex },
[AT_RANDOM - 2] = { "RANDOM: 0x", hex },
+ [AT_HWCAP2 - 2] = { "HWCAP2: 0x", hex },
};
unsigned int idx = (unsigned int) (av->a_type - 2);
@@ -314,10 +318,10 @@
assert (AT_NULL == 0);
assert (AT_IGNORE == 1);
- if (av->a_type == AT_HWCAP)
+ if (av->a_type == AT_HWCAP || av->a_type == AT_HWCAP2)
{
- /* This is handled special. */
- if (_dl_procinfo (av->a_un.a_val) == 0)
+ /* These are handled in a special way per platform. */
+ if (_dl_procinfo (av->a_type, av->a_un.a_val) == 0)
continue;
}
Modified: trunk/libc/elf/elf.h
==============================================================================
--- trunk/libc/elf/elf.h (original)
+++ trunk/libc/elf/elf.h Tue Jul 2 00:11:45 2013
@@ -993,7 +993,7 @@
/* Some more special a_type values describing the hardware. */
#define AT_PLATFORM 15 /* String identifying platform. */
-#define AT_HWCAP 16 /* Machine dependent hints about
+#define AT_HWCAP 16 /* Machine-dependent hints about
processor capabilities. */
/* This entry gives some information about the FPU initialization
@@ -1014,6 +1014,9 @@
#define AT_BASE_PLATFORM 24 /* String identifying real platforms.*/
#define AT_RANDOM 25 /* Address of 16 random bytes. */
+
+#define AT_HWCAP2 26 /* More machine-dependent hints about
+ processor capabilities. */
#define AT_EXECFN 31 /* Filename of executable. */
Modified: trunk/libc/include/libc-internal.h
==============================================================================
--- trunk/libc/include/libc-internal.h (original)
+++ trunk/libc/include/libc-internal.h Tue Jul 2 00:11:45 2013
@@ -50,4 +50,24 @@
/* Cast an integer or a pointer VAL to integer with proper type. */
# define cast_to_integer(val) ((__integer_if_pointer_type (val)) (val))
+/* Align a value by rounding down to closest size.
+ e.g. Using size of 4096, we get this behavior:
+ {4095, 4096, 4097} = {0, 4096, 4096}. */
+#define ALIGN_DOWN(base, size) ((base) & -((__typeof__ (base)) (size)))
+
+/* Align a value by rounding up to closest size.
+ e.g. Using size of 4096, we get this behavior:
+ {4095, 4096, 4097} = {4096, 4096, 8192}.
+
+ Note: The size argument has side effects (expanded multiple times). */
+#define ALIGN_UP(base, size) ALIGN_DOWN ((base) + (size) - 1, (size))
+
+/* Same as ALIGN_DOWN(), but automatically casts when base is a pointer. */
+#define PTR_ALIGN_DOWN(base, size) \
+ ((__typeof__ (base)) ALIGN_DOWN ((uintptr_t) (base), (size)))
+
+/* Same as ALIGN_UP(), but automatically casts when base is a pointer. */
+#define PTR_ALIGN_UP(base, size) \
+ ((__typeof__ (base)) ALIGN_UP ((uintptr_t) (base), (size)))
+
#endif /* _LIBC_INTERNAL */
Modified: trunk/libc/locale/locarchive.h
==============================================================================
--- trunk/libc/locale/locarchive.h (original)
+++ trunk/libc/locale/locarchive.h Tue Jul 2 00:11:45 2013
@@ -84,6 +84,13 @@
void *addr;
size_t mmaped;
size_t reserved;
+ /* If this mmap required adjustment (such as re-aligning), then this is the
+ real address that was returned from mmap and thus should be passed to the
+ munmap call. The addr field above is the first usable address. */
+ void *mmap_base;
+ /* Same as above for mmap_base vs addr, but this is the real length of the
+ map rather than the usable (which is what reserved represents). */
+ size_t mmap_len;
};
Modified: trunk/libc/locale/programs/locarchive.c
==============================================================================
--- trunk/libc/locale/programs/locarchive.c (original)
+++ trunk/libc/locale/programs/locarchive.c Tue Jul 2 00:11:45 2013
@@ -37,8 +37,11 @@
#include <stdint.h>
#include <sys/mman.h>
#include <sys/param.h>
+#include <sys/shm.h>
#include <sys/stat.h>
+#include <libc-internal.h>
+#include <libc-mmap.h>
#include "../../crypt/md5.h"
#include "../localeinfo.h"
#include "../locarchive.h"
@@ -79,21 +82,29 @@
mapping affects the address selection. So do this mapping from the
actual file, even though it's only a dummy to reserve address space. */
static void *
-prepare_address_space (int fd, size_t total, size_t *reserved, int *xflags)
+prepare_address_space (int fd, size_t total, size_t *reserved, int *xflags,
+ void **mmap_base, size_t *mmap_len)
{
if (total < RESERVE_MMAP_SIZE)
{
void *p = mmap64 (NULL, RESERVE_MMAP_SIZE, PROT_NONE, MAP_SHARED, fd, 0);
if (p != MAP_FAILED)
- {
- *reserved = RESERVE_MMAP_SIZE;
- *xflags = MAP_FIXED;
- return p;
- }
+ {
+ void *aligned_p = PTR_ALIGN_UP (p, MAP_FIXED_ALIGNMENT);
+ size_t align_adjust = aligned_p - p;
+ *mmap_base = p;
+ *mmap_len = RESERVE_MMAP_SIZE;
+ assert (align_adjust < RESERVE_MMAP_SIZE);
+ *reserved = RESERVE_MMAP_SIZE - align_adjust;
+ *xflags = MAP_FIXED;
+ return aligned_p;
+ }
}
*reserved = total;
*xflags = 0;
+ *mmap_base = NULL;
+ *mmap_len = 0;
return NULL;
}
@@ -151,9 +162,11 @@
error (EXIT_FAILURE, errval, _("cannot resize archive file"));
}
- size_t reserved;
+ size_t reserved, mmap_len;
int xflags;
- void *p = prepare_address_space (fd, total, &reserved, &xflags);
+ void *mmap_base;
+ void *p = prepare_address_space (fd, total, &reserved, &xflags, &mmap_base,
+ &mmap_len);
/* Map the header and all the administration data structures. */
p = mmap64 (p, total, PROT_READ | PROT_WRITE, MAP_SHARED | xflags, fd, 0);
@@ -199,6 +212,8 @@
}
ah->fd = fd;
+ ah->mmap_base = mmap_base;
+ ah->mmap_len = mmap_len;
ah->addr = p;
ah->mmaped = total;
ah->reserved = reserved;
@@ -271,8 +286,7 @@
if (st.st_size > ah->reserved)
return false;
- const size_t pagesz = getpagesize ();
- size_t start = ah->mmaped & ~(pagesz - 1);
+ size_t start = ALIGN_DOWN (ah->mmaped, MAP_FIXED_ALIGNMENT);
void *p = mmap64 (ah->addr + start, st.st_size - start,
PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED,
ah->fd, start);
@@ -333,10 +347,15 @@
MAP_SHARED | MAP_FIXED, ah->fd, 0);
else
{
- munmap (ah->addr, ah->reserved);
+ if (ah->mmap_base)
+ munmap (ah->mmap_base, ah->mmap_len);
+ else
+ munmap (ah->addr, ah->reserved);
ah->addr = mmap64 (NULL, st.st_size, PROT_READ | PROT_WRITE,
MAP_SHARED, ah->fd, 0);
ah->reserved = st.st_size;
+ ah->mmap_base = NULL;
+ ah->mmap_len = 0;
head = ah->addr;
}
if (ah->addr == MAP_FAILED)
@@ -402,9 +421,11 @@
error (EXIT_FAILURE, errval, _("cannot resize archive file"));
}
- size_t reserved;
+ size_t reserved, mmap_len;
int xflags;
- void *p = prepare_address_space (fd, total, &reserved, &xflags);
+ void *mmap_base;
+ void *p = prepare_address_space (fd, total, &reserved, &xflags, &mmap_base,
+ &mmap_len);
/* Map the header and all the administration data structures. */
p = mmap64 (p, total, PROT_READ | PROT_WRITE, MAP_SHARED | xflags, fd, 0);
@@ -424,6 +445,8 @@
}
new_ah.mmaped = total;
+ new_ah.mmap_base = mmap_base;
+ new_ah.mmap_len = mmap_len;
new_ah.addr = p;
new_ah.fd = fd;
new_ah.reserved = reserved;
@@ -607,9 +630,11 @@
ah->fd = fd;
ah->mmaped = st.st_size;
- size_t reserved;
+ size_t reserved, mmap_len;
int xflags;
- void *p = prepare_address_space (fd, st.st_size, &reserved, &xflags);
+ void *mmap_base;
+ void *p = prepare_address_space (fd, st.st_size, &reserved, &xflags,
+ &mmap_base, &mmap_len);
/* Map the entire file. We might need to compare the category data
in the file with the newly added data. */
@@ -621,6 +646,8 @@
error (EXIT_FAILURE, errno, _("cannot map archive header"));
}
ah->reserved = reserved;
+ ah->mmap_base = mmap_base;
+ ah->mmap_len = mmap_len;
}
@@ -629,7 +656,10 @@
{
if (ah->fd != -1)
{
- munmap (ah->addr, ah->reserved);
+ if (ah->mmap_base)
+ munmap (ah->mmap_base, ah->mmap_len);
+ else
+ munmap (ah->addr, ah->reserved);
close (ah->fd);
}
}
Modified: trunk/libc/manual/install.texi
==============================================================================
--- trunk/libc/manual/install.texi (original)
+++ trunk/libc/manual/install.texi Tue Jul 2 00:11:45 2013
@@ -353,9 +353,9 @@
bugs or lack features.
@item
-GCC 4.3 or newer, GCC 4.6 recommended
-
-GCC 4.3 or higher is required; as of this writing, GCC 4.6 is the
+GCC 4.4 or newer, GCC 4.6 recommended
+
+GCC 4.4 or higher is required; as of this writing, GCC 4.6 is the
compiler we advise to use to build @theglibc{}.
You can use whatever compiler you like to compile programs that use
Modified: trunk/libc/manual/texinfo.tex
==============================================================================
--- trunk/libc/manual/texinfo.tex (original)
+++ trunk/libc/manual/texinfo.tex Tue Jul 2 00:11:45 2013
@@ -3,11 +3,11 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2012-01-19.16}
+\def\texinfoversion{2013-06-21.17}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
%
% This texinfo.tex file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
@@ -24,13 +24,14 @@
%
% As a special exception, when this file is read by TeX when processing
% a Texinfo source document, you may use the result without
-% restriction. (This has been our intent since Texinfo was invented.)
+% restriction. This Exception is an additional permission under section 7
+% of the GNU General Public License, version 3 ("GPLv3").
%
% Please try the latest version of texinfo.tex before submitting bug
% reports; you can get the latest version from:
-% http://www.gnu.org/software/texinfo/ (the Texinfo home page), or
-% ftp://tug.org/tex/texinfo.tex
-% (and all CTAN mirrors, see http://www.ctan.org).
+% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or
+% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or
+% http://www.gnu.org/software/texinfo/ (the Texinfo home page)
% The texinfo.tex in any given distribution could well be out
% of date, so if that's what you're using, please check.
%
@@ -594,7 +595,7 @@
\def\:{\spacefactor=1000 }
% @* forces a line break.
-\def\*{\hfil\break\hbox{}\ignorespaces}
+\def\*{\unskip\hfil\break\hbox{}\ignorespaces}
% @/ allows a line break.
\let\/=\allowbreak
@@ -887,7 +888,7 @@
\def\popthisfilestack{\errthisfilestackempty}
\def\errthisfilestackempty{\errmessage{Internal error:
the stack of filenames is empty.}}
-
+%
\def\thisfile{}
% @center line
@@ -895,36 +896,46 @@
%
\parseargdef\center{%
\ifhmode
- \let\next\centerH
+ \let\centersub\centerH
\else
- \let\next\centerV
+ \let\centersub\centerV
\fi
- \next{\hfil \ignorespaces#1\unskip \hfil}%
-}
-\def\centerH#1{%
- {%
- \hfil\break
- \advance\hsize by -\leftskip
- \advance\hsize by -\rightskip
- \line{#1}%
- \break
- }%
-}
-\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}}
+ \centersub{\hfil \ignorespaces#1\unskip \hfil}%
+ \let\centersub\relax % don't let the definition persist, just in case
+}
+\def\centerH#1{{%
+ \hfil\break
+ \advance\hsize by -\leftskip
+ \advance\hsize by -\rightskip
+ \line{#1}%
+ \break
+}}
+%
+\newcount\centerpenalty
+\def\centerV#1{%
+ % The idea here is the same as in \startdefun, \cartouche, etc.: if
+ % @center is the first thing after a section heading, we need to wipe
+ % out the negative parskip inserted by \sectionheading, but still
+ % prevent a page break here.
+ \centerpenalty = \lastpenalty
+ \ifnum\centerpenalty>10000 \vskip\parskip \fi
+ \ifnum\centerpenalty>9999 \penalty\centerpenalty \fi
+ \line{\kern\leftskip #1\kern\rightskip}%
+}
% @sp n outputs n lines of vertical space
-
+%
\parseargdef\sp{\vskip #1\baselineskip}
% @comment ...line which is ignored...
% @c is the same as @comment
% @ignore ... @end ignore is another way to write a comment
-
+%
\def\comment{\begingroup \catcode`\^^M=\other%
\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
\commentxxx}
{\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}}
-
+%
\let\c=\comment
% @paragraphindent NCHARS
@@ -1097,7 +1108,7 @@
% for display in the outlines, and in other places. Thus, we have to
% double any backslashes. Otherwise, a name like "\node" will be
% interpreted as a newline (\n), followed by o, d, e. Not good.
-%
+%
% See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and
% related messages. The final outcome is that it is up to the TeX user
% to double the backslashes and otherwise make the string valid, so
@@ -1107,7 +1118,7 @@
% #1 is a control sequence in which to do the replacements,
% which we \xdef.
\def\txiescapepdf#1{%
- \ifx\pdfescapestring\relax
+ \ifx\pdfescapestring\thisisundefined
% No primitive available; should we give a warning or log?
% Many times it won't matter.
\else
@@ -1173,8 +1184,8 @@
%
% #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
\def\dopdfimage#1#2#3{%
- \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
- \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
+ \def\pdfimagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
+ \def\pdfimageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
%
% pdftex (and the PDF format) support .pdf, .png, .jpg (among
% others). Let's try in that order, PDF first since if
@@ -1212,8 +1223,8 @@
\else
\immediate\pdfximage
\fi
- \ifdim \wd0 >0pt width \imagewidth \fi
- \ifdim \wd2 >0pt height \imageheight \fi
+ \ifdim \wd0 >0pt width \pdfimagewidth \fi
+ \ifdim \wd2 >0pt height \pdfimageheight \fi
\ifnum\pdftexversion<13
#1.\pdfimgext
\else
@@ -1357,12 +1368,17 @@
\def\skipspaces#1{\def\PP{#1}\def\D{|}%
\ifx\PP\D\let\nextsp\relax
\else\let\nextsp\skipspaces
- \ifx\p\space\else\addtokens{\filename}{\PP}%
- \advance\filenamelength by 1
- \fi
+ \addtokens{\filename}{\PP}%
+ \advance\filenamelength by 1
\fi
\nextsp}
- \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
+ \def\getfilename#1{%
+ \filenamelength=0
+ % If we don't expand the argument now, \skipspaces will get
+ % snagged on things like "@value{foo}".
+ \edef\temp{#1}%
+ \expandafter\skipspaces\temp|\relax
+ }
\ifnum\pdftexversion < 14
\let \startlink \pdfannotlink
\else
@@ -1459,9 +1475,6 @@
\def\ttsl{\setfontstyle{ttsl}}
-% Default leading.
-\newdimen\textleading \textleading = 13.2pt
-
% Set the baselineskip to #1, and the lineskip and strut size
% correspondingly. There is no deep meaning behind these magic numbers
% used as factors; they just match (closely enough) what Knuth defined.
@@ -1473,6 +1486,7 @@
% can get a sort of poor man's double spacing by redefining this.
\def\baselinefactor{1}
%
+\newdimen\textleading
\def\setleading#1{%
\dimen0 = #1\relax
\normalbaselineskip = \baselinefactor\dimen0
@@ -1745,18 +1759,24 @@
\fi\fi
-% Set the font macro #1 to the font named #2, adding on the
-% specified font prefix (normally `cm').
+% Set the font macro #1 to the font named \fontprefix#2.
% #3 is the font's design size, #4 is a scale factor, #5 is the CMap
-% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass
-% empty to omit).
+% encoding (only OT1, OT1IT and OT1TT are allowed, or empty to omit).
+% Example:
+% #1 = \textrm
+% #2 = \rmshape
+% #3 = 10
+% #4 = \mainmagstep
+% #5 = OT1
+%
\def\setfont#1#2#3#4#5{%
\font#1=\fontprefix#2#3 scaled #4
\csname cmap#5\endcsname#1%
}
% This is what gets called when #5 of \setfont is empty.
\let\cmap\gobble
-% emacs-page end of cmaps
+%
+% (end of cmaps)
% Use cm as the default font prefix.
% To specify the font prefix, you must define \fontprefix
@@ -1766,7 +1786,7 @@
\fi
% Support font families that don't use the same naming scheme as CM.
\def\rmshape{r}
-\def\rmbshape{bx} %where the normal face is bold
+\def\rmbshape{bx} % where the normal face is bold
\def\bfshape{b}
\def\bxshape{bx}
\def\ttshape{tt}
@@ -1781,8 +1801,7 @@
\def\scshape{csc}
\def\scbshape{csc}
-% Definitions for a main text size of 11pt. This is the default in
-% Texinfo.
+% Definitions for a main text size of 11pt. (The default in Texinfo.)
%
\def\definetextfontsizexi{%
% Text fonts (11.2pt, magstep1).
@@ -1907,7 +1926,7 @@
\textleading = 13.2pt % line spacing for 11pt CM
\textfonts % reset the current fonts
\rm
-} % end of 11pt text font size definitions
+} % end of 11pt text font size definitions, \definetextfontsizexi
% Definitions to make the main text be 10pt Computer Modern, with
@@ -2039,7 +2058,7 @@
\textleading = 12pt % line spacing for 10pt CM
\textfonts % reset the current fonts
\rm
-} % end of 10pt text font size definitions
+} % end of 10pt text font size definitions, \definetextfontsizex
% We provide the user-level command
@@ -2254,8 +2273,6 @@
\gdef\markupsetcodequoteleft{\let`\codequoteleft}
\gdef\markupsetcodequoteright{\let'\codequoteright}
-
-\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft}
}
\let\markupsetuplqcode \markupsetcodequoteleft
@@ -2264,6 +2281,9 @@
\let\markupsetuplqexample \markupsetcodequoteleft
\let\markupsetuprqexample \markupsetcodequoteright
%
+\let\markupsetuplqkbd \markupsetcodequoteleft
+\let\markupsetuprqkbd \markupsetcodequoteright
+%
\let\markupsetuplqsamp \markupsetcodequoteleft
\let\markupsetuprqsamp \markupsetcodequoteright
%
@@ -2272,8 +2292,6 @@
%
\let\markupsetuplqverbatim \markupsetcodequoteleft
\let\markupsetuprqverbatim \markupsetcodequoteright
-
-\let\markupsetuplqkbd \markupsetnoligaturesquoteleft
% Allow an option to not use regular directed right quote/apostrophe
% (char 0x27), but instead the undirected quote from cmtt (char 0x0d).
@@ -2364,8 +2382,7 @@
\aftersmartic
}
-% like \smartslanted except unconditionally uses \ttsl, and no ic.
-% @var is set to this for defun arguments.
+% Unconditional use \ttsl, and no ic. @var is set to this for defuns.
\def\ttslanted#1{{\ttsl #1}}
% @cite is like \smartslanted except unconditionally use \sl. We never want
@@ -2430,34 +2447,12 @@
% @samp.
\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}}
-% definition of @key that produces a lozenge. Doesn't adjust to text size.
-%\setfont\keyrm\rmshape{8}{1000}{OT1}
-%\font\keysy=cmsy9
-%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
-% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
-% \vbox{\hrule\kern-0.4pt
-% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
-% \kern-0.4pt\hrule}%
-% \kern-.06em\raise0.4pt\hbox{\angleright}}}}
-
-% definition of @key with no lozenge. If the current font is already
-% monospace, don't change it; that way, we respect @kbdinputstyle. But
-% if it isn't monospace, then use \tt.
-%
-\def\key#1{{\setupmarkupstyle{key}%
- \nohyphenation
- \ifmonospace\else\tt\fi
- #1}\null}
-
-% ctrl is no longer a Texinfo command.
-\def\ctrl #1{{\tt \rawbackslash \hat}#1}
-
-% @file, @option are the same as @samp.
-\let\file=\samp
-\let\option=\samp
-
-% @code is a modification of @t,
-% which makes spaces the same size as normal in the surrounding text.
+% @indicateurl is \samp, that is, with quotes.
+\let\indicateurl=\samp
+
+% @code (and similar) prints in typewriter, but with spaces the same
+% size as normal in the surrounding text, without hyphenation, etc.
+% This is a subroutine for that.
\def\tclose#1{%
{%
% Change normal interword space to be same as for the current font.
@@ -2480,14 +2475,14 @@
}
% We *must* turn on hyphenation at `-' and `_' in @code.
+% (But see \codedashfinish below.)
% Otherwise, it is too hard to avoid overfull hboxes
% in the Emacs manual, the Library manual, etc.
-
+%
% Unfortunately, TeX uses one parameter (\hyphenchar) to control
% both hyphenation at - and hyphenation within words.
% We must therefore turn them both off (\tclose does that)
-% and arrange explicitly to hyphenate at a dash.
-% -- rms.
+% and arrange explicitly to hyphenate at a dash. -- rms.
{
\catcode`\-=\active \catcode`\_=\active
\catcode`\'=\active \catcode`\`=\active
@@ -2501,17 +2496,36 @@
\let-\codedash
\let_\codeunder
\else
- \let-\realdash
+ \let-\normaldash
\let_\realunder
\fi
+ % Given -foo (with a single dash), we do not want to allow a break
+ % after the hyphen.
+ \global\let\codedashprev=\codedash
+ %
\codex
}
-}
-
+ %
+ \gdef\codedash{\futurelet\next\codedashfinish}
+ \gdef\codedashfinish{%
+ \normaldash % always output the dash character itself.
+ %
+ % Now, output a discretionary to allow a line break, unless
+ % (a) the next character is a -, or
+ % (b) the preceding character is a -.
+ % E.g., given --posix, we do not want to allow a break after either -.
+ % Given --foo-bar, we do want to allow a break between the - and the b.
+ \ifx\next\codedash \else
+ \ifx\codedashprev\codedash
+ \else \discretionary{}{}{}\fi
+ \fi
+ \global\let\codedashprev=\next
+ }
+}
+\def\normaldash{-}
+%
\def\codex #1{\tclose{#1}\endgroup}
-\def\realdash{-}
-\def\codedash{-\discretionary{}{}{}}
\def\codeunder{%
% this is all so @math{@code{var_name}+1} can work. In math mode, _
% is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.)
@@ -2525,9 +2539,9 @@
}
% An additional complication: the above will allow breaks after, e.g.,
-% each of the four underscores in __typeof__. This is undesirable in
-% some manuals, especially if they don't have long identifiers in
-% general. @allowcodebreaks provides a way to control this.
+% each of the four underscores in __typeof__. This is bad.
+% @allowcodebreaks provides a document-level way to turn breaking at -
+% and _ on and off.
%
\newif\ifallowcodebreaks \allowcodebreakstrue
@@ -2545,6 +2559,13 @@
\errmessage{Unknown @allowcodebreaks option `\txiarg', must be true|false}%
\fi\fi
}
+
+% For @command, @env, @file, @option quotes seem unnecessary,
+% so use \code rather than \samp.
+\let\command=\code
+\let\env=\code
+\let\file=\code
+\let\option=\code
% @uref (abbreviation for `urlref') takes an optional (comma-separated)
% second argument specifying the text to display and an optional third
@@ -2692,10 +2713,6 @@
\let\email=\uref
\fi
-% @kbd is like @code, except that if the argument is just one @key command,
-% then @kbd has no effect.
-\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}}
-
% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
% `example' (@kbd uses ttsl only inside of @example and friends),
% or `code' (@kbd uses normal tty font always).
@@ -2719,16 +2736,36 @@
% Default is `distinct'.
\kbdinputstyle distinct
+% @kbd is like @code, except that if the argument is just one @key command,
+% then @kbd has no effect.
+\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}}
+
\def\xkey{\key}
-\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
-\ifx\one\xkey\ifx\threex\three \key{#2}%
-\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
-\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi}
-
-% For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
-\let\indicateurl=\code
-\let\env=\code
-\let\command=\code
+\def\kbdsub#1#2#3\par{%
+ \def\one{#1}\def\three{#3}\def\threex{??}%
+ \ifx\one\xkey\ifx\threex\three \key{#2}%
+ \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
+ \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
+}
+
+% definition of @key that produces a lozenge. Doesn't adjust to text size.
+%\setfont\keyrm\rmshape{8}{1000}{OT1}
+%\font\keysy=cmsy9
+%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
+% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
+% \vbox{\hrule\kern-0.4pt
+% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
+% \kern-0.4pt\hrule}%
+% \kern-.06em\raise0.4pt\hbox{\angleright}}}}
+
+% definition of @key with no lozenge. If the current font is already
+% monospace, don't change it; that way, we respect @kbdinputstyle. But
+% if it isn't monospace, then use \tt.
+%
+\def\key#1{{\setupmarkupstyle{key}%
+ \nohyphenation
+ \ifmonospace\else\tt\fi
+ #1}\null}
% @clicksequence{File @click{} Open ...}
\def\clicksequence#1{\begingroup #1\endgroup}
@@ -2835,6 +2872,9 @@
\let' = \ptexquoteright
}
}
+
+% ctrl is no longer a Texinfo command, but leave this definition for fun.
+\def\ctrl #1{{\tt \rawbackslash \hat}#1}
% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}.
% Ignore unless FMTNAME == tex; then it is like @iftex and @tex,
@@ -3126,12 +3166,17 @@
% hopefully nobody will notice/care.
\edef\ecsize{\csname\curfontsize ecsize\endcsname}%
\edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
- \ifx\curfontstyle\bfstylename
- % bold:
- \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
+ \ifmonospace
+ % typewriter:
+ \font\thisecfont = ectt\ecsize \space at \nominalsize
\else
- % regular:
- \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
+ \ifx\curfontstyle\bfstylename
+ % bold:
+ \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
+ \else
+ % regular:
+ \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
+ \fi
\fi
\thisecfont
}
@@ -3244,6 +3289,20 @@
\finishedtitlepagetrue
}
+% Settings used for typesetting titles: no hyphenation, no indentation,
+% don't worry much about spacing, ragged right. This should be used
+% inside a \vbox, and fonts need to be set appropriately first. Because
+% it is always used for titles, nothing else, we call \rmisbold. \par
+% should be specified before the end of the \vbox, since a vbox is a group.
+%
+\def\raggedtitlesettings{%
+ \rmisbold
+ \hyphenpenalty=10000
+ \parindent=0pt
+ \tolerance=5000
+ \ptexraggedright
+}
+
% Macros to be used within @titlepage:
\let\subtitlerm=\tenrm
@@ -3251,7 +3310,7 @@
\parseargdef\title{%
\checkenv\titlepage
- \leftline{\titlefonts\rmisbold #1}
+ \vbox{\titlefonts \raggedtitlesettings #1\par}%
% print a rule at the page bottom also.
\finishedtitlepagefalse
\vskip4pt \hrule height 4pt width \hsize \vskip4pt
@@ -4148,7 +4207,7 @@
% ..., but we might end up with active ones in the argument if
% we're called from @code, as @code{@value{foo-bar_}}, though.
% So \let them to their normal equivalents.
- \let-\realdash \let_\normalunderscore
+ \let-\normaldash \let_\normalunderscore
}
}
@@ -4172,7 +4231,8 @@
% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
% with @set.
%
-% To get special treatment of `@end ifset,' call \makeond and the redefine.
+% To get the special treatment we need for `@end ifset,' we call
+% \makecond and then redefine.
%
\makecond{ifset}
\def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}}
@@ -4188,7 +4248,7 @@
}
\def\ifsetfail{\doignore{ifset}}
-% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
+% @ifclear VAR ... @end executes the `...' iff VAR has never been
% defined with @set, or has been undefined with @clear.
%
% The `\else' inside the `\doifset' parameter is a trick to reuse the
@@ -4198,6 +4258,35 @@
\makecond{ifclear}
\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}}
\def\ifclearfail{\doignore{ifclear}}
+
+% @ifcommandisdefined CMD ... @end executes the `...' if CMD (written
+% without the @) is in fact defined. We can only feasibly check at the
+% TeX level, so something like `mathcode' is going to considered
+% defined even though it is not a Texinfo command.
+%
+\makecond{ifcommanddefined}
+\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}}
+%
+\def\doifcmddefined#1#2{{%
+ \makevalueexpandable
+ \let\next=\empty
+ \expandafter\ifx\csname #2\endcsname\relax
+ #1% If not defined, \let\next as above.
+ \fi
+ \expandafter
+ }\next
+}
+\def\ifcmddefinedfail{\doignore{ifcommanddefined}}
+
+% @ifcommandnotdefined CMD ... handled similar to @ifclear above.
+\makecond{ifcommandnotdefined}
+\def\ifcommandnotdefined{%
+ \parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}}
+\def\ifcmdnotdefinedfail{\doignore{ifcommandnotdefined}}
+
+% Set the `txicommandconditionals' variable, so documents have a way to
+% test if the @ifcommand...defined conditionals are available.
+\set txicommandconditionals
% @dircategory CATEGORY -- specify a category of the dir file
% which this file should belong to. Ignore this in TeX.
@@ -4435,6 +4524,7 @@
\definedummyword\guillemetright
\definedummyword\guilsinglleft
\definedummyword\guilsinglright
+ \definedummyword\lbracechar
\definedummyword\leq
\definedummyword\minus
\definedummyword\ogonek
@@ -4447,6 +4537,7 @@
\definedummyword\quoteleft
\definedummyword\quoteright
\definedummyword\quotesinglbase
+ \definedummyword\rbracechar
\definedummyword\result
\definedummyword\textdegree
%
@@ -4498,6 +4589,7 @@
\definedummyword\t
%
% Commands that take arguments.
+ \definedummyword\abbr
\definedummyword\acronym
\definedummyword\anchor
\definedummyword\cite
@@ -4509,7 +4601,9 @@
\definedummyword\emph
\definedummyword\env
\definedummyword\file
+ \definedummyword\image
\definedummyword\indicateurl
+ \definedummyword\inforef
\definedummyword\kbd
\definedummyword\key
\definedummyword\math
@@ -4556,7 +4650,10 @@
% content at all. So for index sorting, we map @{ and @} to strings
% starting with |, since that ASCII character is between ASCII { and }.
\def\{{|a}%
+ \def\lbracechar{|a}%
+ %
\def\}{|b}%
+ \def\rbracechar{|b}%
%
% Non-English letters.
\def\AA{AA}%
@@ -4732,10 +4829,9 @@
%
% ..., ready, GO:
%
-\def\safewhatsit#1{%
-\ifhmode
+\def\safewhatsit#1{\ifhmode
#1%
-\else
+ \else
% \lastskip and \lastpenalty cannot both be nonzero simultaneously.
\whatsitskip = \lastskip
\edef\lastskipmacro{\the\lastskip}%
@@ -4759,7 +4855,6 @@
% to re-insert the same penalty (values >10000 are used for various
% signals); since we just inserted a non-discardable item, any
% following glue (such as a \parskip) would be a breakpoint. For example:
- %
% @deffn deffn-whatever
% @vindex index-whatever
% Description.
@@ -4772,8 +4867,7 @@
% (the whatsit from the \write), so we must insert a \nobreak.
\nobreak\vskip\whatsitskip
\fi
-\fi
-}
+\fi}
% The index entry written in the file actually looks like
% \entry {sortstring}{page}{topic}
@@ -5520,14 +5614,6 @@
% Define @majorheading, @heading and @subheading
-% NOTE on use of \vbox for chapter headings, section headings, and such:
-% 1) We use \vbox rather than the earlier \line to permit
-% overlong headings to fold.
-% 2) \hyphenpenalty is set to 10000 because hyphenation in a
-% heading is obnoxious; this forbids it.
-% 3) Likewise, headings look best if no \parindent is used, and
-% if justification is not attempted. Hence \raggedright.
-
\def\majorheading{%
{\advance\chapheadingskip by 10pt \chapbreak }%
\parsearg\chapheadingzzz
@@ -5535,10 +5621,8 @@
\def\chapheading{\chapbreak \parsearg\chapheadingzzz}
\def\chapheadingzzz#1{%
- {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
- \parindent=0pt\ptexraggedright
- \rmisbold #1\hfill}}%
- \bigskip \par\penalty 200\relax
+ \vbox{\chapfonts \raggedtitlesettings #1\par}%
+ \nobreak\bigskip \nobreak
\suppressfirstparagraphindent
}
@@ -5697,8 +5781,7 @@
%
% Typeset the actual heading.
\nobreak % Avoid page breaks at the interline glue.
- \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
- \hangindent=\wd0 \centerparametersmaybe
+ \vbox{\raggedtitlesettings \hangindent=\wd0 \centerparametersmaybe
\unhbox0 #1\par}%
}%
\nobreak\bigskip % no page break after a chapter title
@@ -5720,18 +5803,18 @@
\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
%
\def\unnchfopen #1{%
-\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
- \parindent=0pt\ptexraggedright
- \rmisbold #1\hfill}}\bigskip \par\nobreak
+ \chapoddpage
+ \vbox{\chapfonts \raggedtitlesettings #1\par}%
+ \nobreak\bigskip\nobreak
}
\def\chfopen #1#2{\chapoddpage {\chapfonts
\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
\par\penalty 5000 %
}
\def\centerchfopen #1{%
-\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
- \parindent=0pt
- \hfill {\rmisbold #1}\hfill}}\bigskip \par\nobreak
+ \chapoddpage
+ \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}%
+ \nobreak\bigskip \nobreak
}
\def\CHAPFopen{%
\global\let\chapmacro=\chfopen
@@ -5876,14 +5959,15 @@
%
% We'll almost certainly start a paragraph next, so don't let that
% glue accumulate. (Not a breakpoint because it's preceded by a
- % discardable item.)
+ % discardable item.) However, when a paragraph is not started next
+ % (\startdefun, \cartouche, \center, etc.), this needs to be wiped out
+ % or the negative glue will cause weirdly wrong output, typically
+ % obscuring the section heading with something else.
\vskip-\parskip
%
- % This is purely so the last item on the list is a known \penalty >
- % 10000. This is so \startdefun can avoid allowing breakpoints after
- % section headings. Otherwise, it would insert a valid breakpoint between:
- % @section sec-whatever
- % @deffn def-whatever
+ % This is so the last item on the main vertical list is a known
+ % \penalty > 10000, so \startdefun, etc., can recognize the situation
+ % and do the needful.
\penalty 10001
}
@@ -6303,7 +6387,7 @@
% If this cartouche directly follows a sectioning command, we need the
% \parskip glue (backspaced over by default) or the cartouche can
% collide with the section heading.
- \ifnum\lastpenalty>10000 \vskip\parskip \fi
+ \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi
%
\vbox\bgroup
\baselineskip=0pt\parskip=0pt\lineskip=0pt
@@ -6338,7 +6422,7 @@
\newdimen\nonfillparindent
\def\nonfillstart{%
\aboveenvbreak
- \hfuzz = 12pt % Don't be fussy
+ \ifdim\hfuzz < 12pt \hfuzz = 12pt \fi % Don't be fussy
\sepspaces % Make spaces be word-separators rather than space tokens.
\let\par = \lisppar % don't ignore blank lines
\obeylines % each line of input is a line of output
@@ -6496,16 +6580,9 @@
\makedispenvdef{quotation}{\quotationstart}
%
\def\quotationstart{%
- {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
- \parindent=0pt
- %
- % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
+ \indentedblockstart % same as \indentedblock, but increase right margin too.
\ifx\nonarrowing\relax
- \advance\leftskip by \lispnarrowing
\advance\rightskip by \lispnarrowing
- \exdentamount = \lispnarrowing
- \else
- \let\nonarrowing = \relax
\fi
\parsearg\quotationlabel
}
@@ -6530,6 +6607,32 @@
{\bf #1: }%
\fi
}
+
+% @indentedblock is like @quotation, but indents only on the left and
+% has no optional argument.
+%
+\makedispenvdef{indentedblock}{\indentedblockstart}
+%
+\def\indentedblockstart{%
+ {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
+ \parindent=0pt
+ %
+ % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
+ \ifx\nonarrowing\relax
+ \advance\leftskip by \lispnarrowing
+ \exdentamount = \lispnarrowing
+ \else
+ \let\nonarrowing = \relax
+ \fi
+}
+
+% Keep a nonzero parskip for the environment, since we're doing normal filling.
+%
+\def\Eindentedblock{%
+ \par
+ {\parskip=0pt \afterenvbreak}%
+}
+\def\Esmallindentedblock{\Eindentedblock}
% LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>}
@@ -7009,7 +7112,10 @@
\df \sl \hyphenchar\font=0
%
% On the other hand, if an argument has two dashes (for instance), we
- % want a way to get ttsl. Let's try @var for that.
+ % want a way to get ttsl. We used to recommend @var for that, so
+ % leave the code in, but it's strange for @var to lead to typewriter.
+ % Nowadays we recommend @code, since the difference between a ttsl hyphen
+ % and a tt hyphen is pretty tiny. @code also disables ?` !`.
\def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}%
#1%
\sl\hyphenchar\font=45
@@ -7793,7 +7899,7 @@
\fi\fi
}
-
+%
% @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is
% the node name, #2 the name of the Info cross-reference, #3 the printed
% node name, #4 the name of the Info file, #5 the name of the printed
@@ -7803,15 +7909,20 @@
\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
\def\ref#1{\xrefX[#1,,,,,,,]}
%
-\newbox\topbox
+\newbox\toprefbox
\newbox\printedrefnamebox
+\newbox\infofilenamebox
\newbox\printedmanualbox
%
\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
\unsepspaces
%
+ % Get args without leading/trailing spaces.
\def\printedrefname{\ignorespaces #3}%
\setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
+ %
+ \def\infofilename{\ignorespaces #4}%
+ \setbox\infofilenamebox = \hbox{\infofilename\unskip}%
%
\def\printedmanual{\ignorespaces #5}%
\setbox\printedmanualbox = \hbox{\printedmanual\unskip}%
@@ -7845,12 +7956,20 @@
\ifpdf
{\indexnofonts
\turnoffactive
+ \makevalueexpandable
% This expands tokens, so do it after making catcode changes, so _
- % etc. don't get their TeX definitions.
+ % etc. don't get their TeX definitions. This ignores all spaces in
+ % #4, including (wrongly) those in the middle of the filename.
\getfilename{#4}%
%
+ % This (wrongly) does not take account of leading or trailing
+ % spaces in #1, which should be ignored.
\edef\pdfxrefdest{#1}%
- \txiescapepdf\pdfxrefdest
+ \ifx\pdfxrefdest\empty
+ \def\pdfxrefdest{Top}% no empty targets
+ \else
+ \txiescapepdf\pdfxrefdest % escape PDF special chars
+ \fi
%
\leavevmode
\startlink attr{/Border [0 0 0]}%
@@ -7883,7 +8002,7 @@
\printedrefname
\fi
%
- % if the user also gave the printed manual name (fifth arg), append
+ % If the user also gave the printed manual name (fifth arg), append
% "in MANUALNAME".
\ifdim \wd\printedmanualbox > 0pt
\space \putwordin{} \cite{\printedmanual}%
@@ -7898,32 +8017,20 @@
% this is a loss. Therefore, we give the text of the node name
% again, so it is as if TeX is seeing it for the first time.
%
- % Cross-manual reference. Only include the "Section ``foo'' in" if
- % the foo is neither missing or Top. Thus, @xref{,,,foo,The Foo Manual}
- % outputs simply "see The Foo Manual".
\ifdim \wd\printedmanualbox > 0pt
- % What is the 7sp about? The idea is that we also want to omit
- % the Section part if we would be printing "Top", since they are
- % clearly trying to refer to the whole manual. But, this being
- % TeX, we can't easily compare strings while ignoring the possible
- % spaces before and after in the input. By adding the arbitrary
- % 7sp, we make it much less likely that a real node name would
- % happen to have the same width as "Top" (e.g., in a monospaced font).
- % I hope it will never happen in practice.
+ % Cross-manual reference with a printed manual name.
%
- % For the same basic reason, we retypeset the "Top" at every
- % reference, since the current font is indeterminate.
+ \crossmanualxref{\cite{\printedmanual\unskip}}%
+ %
+ \else\ifdim \wd\infofilenamebox > 0pt
+ % Cross-manual reference with only an info filename (arg 4), no
+ % printed manual name (arg 5). This is essentially the same as
+ % the case above; we output the filename, since we have nothing else.
%
- \setbox\topbox = \hbox{Top\kern7sp}%
- \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
- \ifdim \wd2 > 7sp
- \ifdim \wd2 = \wd\topbox \else
- \putwordSection{} ``\printedrefname'' \putwordin{}\space
- \fi
- \fi
- \cite{\printedmanual}%
+ \crossmanualxref{\code{\infofilename\unskip}}%
+ %
\else
- % Reference in this manual.
+ % Reference within this manual.
%
% _ (for example) has to be the character _ for the purposes of the
% control sequence corresponding to the node, but it has to expand
@@ -7944,10 +8051,36 @@
%
% output the `page 3'.
\turnoffactive \putwordpage\tie\refx{#1-pg}{}%
- \fi
+ \fi\fi
\fi
\endlink
\endgroup}
+
+% Output a cross-manual xref to #1. Used just above (twice).
+%
+% Only include the text "Section ``foo'' in" if the foo is neither
+% missing or Top. Thus, @xref{,,,foo,The Foo Manual} outputs simply
+% "see The Foo Manual", the idea being to refer to the whole manual.
+%
+% But, this being TeX, we can't easily compare our node name against the
+% string "Top" while ignoring the possible spaces before and after in
+% the input. By adding the arbitrary 7sp below, we make it much less
+% likely that a real node name would have the same width as "Top" (e.g.,
+% in a monospaced font). Hopefully it will never happen in practice.
+%
+% For the same basic reason, we retypeset the "Top" at every
+% reference, since the current font is indeterminate.
+%
+\def\crossmanualxref#1{%
+ \setbox\toprefbox = \hbox{Top\kern7sp}%
+ \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
+ \ifdim \wd2 > 7sp % nonempty?
+ \ifdim \wd2 = \wd\toprefbox \else % same as Top?
+ \putwordSection{} ``\printedrefname'' \putwordin{}\space
+ \fi
+ \fi
+ #1%
+}
% This macro is called from \xrefX for the `[nodename]' part of xref
% output. It's a separate macro only so it can be changed more easily,
@@ -8316,7 +8449,7 @@
it from ftp://tug.org/tex/epsf.tex.}
%
\def\image#1{%
- \ifx\epsfbox\thisiundefined
+ \ifx\epsfbox\thisisundefined
\ifwarnednoepsf \else
\errhelp = \noepsfhelp
\errmessage{epsf.tex not found, images will be ignored}%
@@ -8340,6 +8473,13 @@
% If the image is by itself, center it.
\ifvmode
\imagevmodetrue
+ \else \ifx\centersub\centerV
+ % for @center @image, we need a vbox so we can have our vertical space
+ \imagevmodetrue
+ \vbox\bgroup % vbox has better behavior than vtop herev
+ \fi\fi
+ %
+ \ifimagevmode
\nobreak\medskip
% Usually we'll have text after the image which will insert
% \parskip glue, so insert it here too to equalize the space
@@ -8349,9 +8489,13 @@
\fi
%
% Leave vertical mode so that indentation from an enclosing
- % environment such as @quotation is respected. On the other hand, if
- % it's at the top level, we don't want the normal paragraph indentation.
- \noindent
+ % environment such as @quotation is respected.
+ % However, if we're at the top level, we don't want the
+ % normal paragraph indentation.
+ % On the other hand, if we are in the case of @center @image, we don't
+ % want to start a paragraph, which will create a hsize-width box and
+ % eradicate the centering.
+ \ifx\centersub\centerV\else \noindent \fi
%
% Output the image.
\ifpdf
@@ -8363,7 +8507,10 @@
\epsfbox{#1.eps}%
\fi
%
- \ifimagevmode \medskip \fi % space after the standalone image
+ \ifimagevmode
+ \medskip % space after a standalone image
+ \fi
+ \ifx\centersub\centerV \egroup \fi
\endgroup}
@@ -9866,22 +10013,26 @@
@gdef@otherbackslash{@let\=@realbackslash}
% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'.
-%
-@def@normalturnoffactive{%
- @let"=@normaldoublequote
- @let$=@normaldollar %$ font-lock fix
- @let+=@normalplus
- @let<=@normalless
- @let>=@normalgreater
- @let\=@normalbackslash
- @let^=@normalcaret
- @let_=@normalunderscore
- @let|=@normalverticalbar
- @let~=@normaltilde
- @markupsetuplqdefault
- @markupsetuprqdefault
- @unsepspaces
+% the literal character `\'. Also revert - to its normal character, in
+% case the active - from code has slipped in.
+%
+{@catcode`- = @active
+ @gdef@normalturnoffactive{%
+ @let-=@normaldash
+ @let"=@normaldoublequote
+ @let$=@normaldollar %$ font-lock fix
+ @let+=@normalplus
+ @let<=@normalless
+ @let>=@normalgreater
+ @let\=@normalbackslash
+ @let^=@normalcaret
+ @let_=@normalunderscore
+ @let|=@normalverticalbar
+ @let~=@normaltilde
+ @markupsetuplqdefault
+ @markupsetuprqdefault
+ @unsepspaces
+ }
}
% Make _ and + \other characters, temporarily.
Modified: trunk/libc/misc/getauxval.c
==============================================================================
--- trunk/libc/misc/getauxval.c (original)
+++ trunk/libc/misc/getauxval.c Tue Jul 2 00:11:45 2013
@@ -26,6 +26,8 @@
if (type == AT_HWCAP)
return GLRO(dl_hwcap);
+ else if (type == AT_HWCAP2)
+ return GLRO(dl_hwcap2);
for (p = GLRO(dl_auxv); p->a_type != AT_NULL; p++)
if (p->a_type == type)
Modified: trunk/libc/nptl/ChangeLog
==============================================================================
--- trunk/libc/nptl/ChangeLog (original)
+++ trunk/libc/nptl/ChangeLog Tue Jul 2 00:11:45 2013
@@ -1,3 +1,8 @@
+2013-06-24 Vladimir Nikulichev <v.nikulichev@xxxxxxxxx>
+
+ [BZ #12310]
+ * pthread_exit.c: Add reference to pthread_create.
+
2013-06-22 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* pthread_getattr_default_np.c: Include <string.h>.
Modified: trunk/libc/nptl/pthread_exit.c
==============================================================================
--- trunk/libc/nptl/pthread_exit.c (original)
+++ trunk/libc/nptl/pthread_exit.c Tue Jul 2 00:11:45 2013
@@ -29,3 +29,7 @@
__do_cancel ();
}
strong_alias (__pthread_exit, pthread_exit)
+
+/* After a thread terminates, __libc_start_main decrements
+ __nptl_nthreads defined in pthread_create.c. */
+PTHREAD_STATIC_FN_REQUIRE (pthread_create)
Modified: trunk/libc/nscd/connections.c
==============================================================================
--- trunk/libc/nscd/connections.c (original)
+++ trunk/libc/nscd/connections.c Tue Jul 2 00:11:45 2013
@@ -722,8 +722,8 @@
cannot create read-only descriptor for \"%s\"; no mmap"),
dbs[cnt].db_filename);
- /* Before we create the header, initialiye the hash
- table. So that if we get interrupted if writing
+ /* Before we create the header, initialize the hash
+ table. That way if we get interrupted while writing
the header we can recognize a partially initialized
database. */
size_t ps = sysconf (_SC_PAGESIZE);
Modified: trunk/libc/ports/ChangeLog.aarch64
==============================================================================
--- trunk/libc/ports/ChangeLog.aarch64 (original)
+++ trunk/libc/ports/ChangeLog.aarch64 Tue Jul 2 00:11:45 2013
@@ -1,3 +1,13 @@
+2013-06-28 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
+
+ * sysdeps/aarch64/dl-machine.h (elf_machine_dynamic): De-reference
+ _GLOBAL_OFFSET_TABLE_.
+
+2013-06-28 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/aarch64/getcontext.S (__getcontext): Simplify
+ oPSTATE initialization.
+
2013-06-15 Siddhesh Poyarekar <siddhesh@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/aarch64/nptl/libpthread.abilist:
Modified: trunk/libc/ports/ChangeLog.alpha
==============================================================================
--- trunk/libc/ports/ChangeLog.alpha (original)
+++ trunk/libc/ports/ChangeLog.alpha Tue Jul 2 00:11:45 2013
@@ -1,3 +1,20 @@
+2013-06-28 Ryan S. Arnold <rsa@xxxxxxxxxxxxxxxxxx>
+
+ * sysdeps/alpha/dl-procinfo.h (_dl_procinfo): Add TYPE parameter
+ to macro prototype for AT_HWCAP2 support.
+
+2013-06-24 Richard Henderson <rth@xxxxxxxxxx>
+
+ [BZ #15666]
+ * sysdeps/alpha/Versions (GLIBC_2.18): Add __sqrt_finite,
+ __sqrtf_finite, and __sqrtl_finite.
+ * sysdeps/unix/sysv/linux/alpha/nptl/libm.abilist: Likewise.
+ * sysdeps/alpha/alphaev6/fpu/e_sqrt.S: Add __sqrt_finite.
+ * sysdeps/alpha/alphaev6/fpu/e_sqrtf.S: Add __sqrtf_finite.
+ * sysdeps/alpha/fpu/e_sqrt.c: Add __sqrt_finite compatibility.
+ * sysdeps/alpha/fpu/e_sqrtf.c: New file.
+ * sysdeps/alpha/soft-fp/e_sqrtl.c: Add __sqrtl_finite.
+
2013-06-23 Richard Henderson <rth@xxxxxxxxxx>
* sysdeps/alpha/fpu/libm-test-ulps: Update.
Modified: trunk/libc/ports/ChangeLog.arm
==============================================================================
--- trunk/libc/ports/ChangeLog.arm (original)
+++ trunk/libc/ports/ChangeLog.arm Tue Jul 2 00:11:45 2013
@@ -1,3 +1,10 @@
+2013-06-28 Ryan S. Arnold <rsa@xxxxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/arm/dl-procinfo.h (_dl_procinfo): Add
+ TYPE parameter to macro prototype for AT_HWCAP2 support. Make WORD
+ unsigned long int rather than signed int. Stub in handler for TYPE ==
+ AT_HWCAP2 to return -1 for unknown a_type display fallback.
+
2013-06-18 Roland McGrath <roland@xxxxxxxxxxxxx>
* sysdeps/arm/arm-mcount.S: Comment typo fix.
Modified: trunk/libc/ports/ChangeLog.ia64
==============================================================================
--- trunk/libc/ports/ChangeLog.ia64 (original)
+++ trunk/libc/ports/ChangeLog.ia64 Tue Jul 2 00:11:45 2013
@@ -1,3 +1,10 @@
+2013-06-27 Maciej W. Rozycki <macro@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/ia64/dl-static.c: Do not include
+ <bits/libc-lock.h>.
+ (_dl_static_lock): Remove variable.
+ (_dl_static_init): Remove _dl_static_lock locking.
+
2013-06-15 Siddhesh Poyarekar <siddhesh@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/ia64/nptl/libpthread.abilist: Update.
Modified: trunk/libc/ports/ChangeLog.m68k
==============================================================================
--- trunk/libc/ports/ChangeLog.m68k (original)
+++ trunk/libc/ports/ChangeLog.m68k Tue Jul 2 00:11:45 2013
@@ -1,3 +1,30 @@
+2013-06-30 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/m68k/dl-trampoline.S (FMOVE): Define conditional on
+ [__mcoldfire__] and [__mcffpu__].
+ (FPSPACE): Likewise.
+ (_dl_runtime_profile): Save and restore %fp0 with FMOVE, only if
+ [FMOVE]. Use FPSPACE in stack offsets.
+
+2013-06-28 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/m68k/fpu_control.h: Fix preprocessor indentation.
+
+2013-06-28 Nathan Sidwell <nathan@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/m68k/fpu_control.h [__mcoldfire__ && !__mcffpu__]
+ (_FPU_RESERVED): Provide alternative definition.
+ [__mcoldfire__ && !__mcffpu__] (_FPU_DEFAULT): Likewise.
+ [__mcoldfire__ && !__mcffpu__] (_FPU_GETCW): Likewise.
+ [__mcoldfire__ && !__mcffpu__] (_FPU_SETCW): Likewise.
+ [!(__mcoldfire__ && !__mcffpu__)]: Make existing macro definitions
+ conditional.
+
+2013-06-25 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
+
+ * sysdeps/m68k/sysdep.h (CALL_MCOUNT) [PROF]: Use %a6 instead of
+ %fp in cfi insns.
+
2013-06-15 Siddhesh Poyarekar <siddhesh@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libpthread.abilist:
Modified: trunk/libc/ports/ChangeLog.mips
==============================================================================
--- trunk/libc/ports/ChangeLog.mips (original)
+++ trunk/libc/ports/ChangeLog.mips Tue Jul 2 00:11:45 2013
@@ -1,3 +1,15 @@
+2013-06-28 Ryan S. Arnold <rsa@xxxxxxxxxxxxxxxxxx>
+
+ * sysdeps/mips/dl-procinfo.h (_dl_procinfo): Add TYPE parameter
+ to macro prototype for AT_HWCAP2 support.
+
+2013-06-27 Maciej W. Rozycki <macro@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/mips/dl-static.c: Do not include
+ <bits/libc-lock.h>.
+ (_dl_static_lock): Remove variable.
+ (_dl_static_init): Remove _dl_static_lock locking.
+
2013-06-15 Siddhesh Poyarekar <siddhesh@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/mips/mips32/nptl/libpthread.abilist:
Modified: trunk/libc/ports/ChangeLog.tile
==============================================================================
--- trunk/libc/ports/ChangeLog.tile (original)
+++ trunk/libc/ports/ChangeLog.tile Tue Jul 2 00:11:45 2013
@@ -1,3 +1,12 @@
+2013-06-28 Chris Metcalf <cmetcalf@xxxxxxxxxx>
+
+ * sysdeps/tile/fegetenv.c: Delete now-redundant file.
+ * sysdeps/tile/fegetround.c: Likewise.
+ * sysdeps/tile/feholdexcpt.c: Likewise.
+ * sysdeps/tile/fesetenv.c: Likewise.
+ * sysdeps/tile/fesetround.c: Likewise.
+ * sysdeps/tile/feupdateenv.c: Likewise.
+
2013-06-15 Siddhesh Poyarekar <siddhesh@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libpthread.abilist:
Modified: trunk/libc/ports/sysdeps/aarch64/dl-machine.h
==============================================================================
--- trunk/libc/ports/sysdeps/aarch64/dl-machine.h (original)
+++ trunk/libc/ports/sysdeps/aarch64/dl-machine.h Tue Jul 2 00:11:45 2013
@@ -36,8 +36,8 @@
static inline ElfW(Addr) __attribute__ ((unused))
elf_machine_dynamic (void)
{
- ElfW(Addr) addr = (ElfW(Addr)) &_DYNAMIC;
- return addr;
+ extern const ElfW(Addr) _GLOBAL_OFFSET_TABLE_[] attribute_hidden;
+ return _GLOBAL_OFFSET_TABLE_[0];
}
/* Return the run-time load address of the shared object. */
Modified: trunk/libc/ports/sysdeps/alpha/Versions
==============================================================================
--- trunk/libc/ports/sysdeps/alpha/Versions (original)
+++ trunk/libc/ports/sysdeps/alpha/Versions Tue Jul 2 00:11:45 2013
@@ -10,4 +10,8 @@
# used in inline functions.
__atan2;
}
+ GLIBC_2.18 {
+ # forgotten when the symbols were added to glibc 2.15 for other targets
+ __sqrt_finite; __sqrtf_finite; __sqrtl_finite;
+ }
}
Modified: trunk/libc/ports/sysdeps/alpha/alphaev6/fpu/e_sqrt.S
==============================================================================
--- trunk/libc/ports/sysdeps/alpha/alphaev6/fpu/e_sqrt.S (original)
+++ trunk/libc/ports/sysdeps/alpha/alphaev6/fpu/e_sqrt.S Tue Jul 2 00:11:45 2013
@@ -16,6 +16,7 @@
<http://www.gnu.org/licenses/>. */
#include <sysdep.h>
+#include <shlib-compat.h>
.arch ev6
.set noreorder
@@ -42,3 +43,11 @@
nop
END(__ieee754_sqrt)
+
+#if SHLIB_COMPAT (libm, GLIBC_2_15, GLIBC_2_18)
+strong_alias(__ieee754_sqrt, __sqrt_finite1)
+compat_symbol(libm, __sqrt_finite1, __sqrt_finite, GLIBC_2_15)
+versioned_symbol(libm, __ieee754_sqrt, __sqrt_finite, GLIBC_2_18)
+#else
+strong_alias(__ieee754_sqrt, __sqrt_finite)
+#endif
Modified: trunk/libc/ports/sysdeps/alpha/alphaev6/fpu/e_sqrtf.S
==============================================================================
--- trunk/libc/ports/sysdeps/alpha/alphaev6/fpu/e_sqrtf.S (original)
+++ trunk/libc/ports/sysdeps/alpha/alphaev6/fpu/e_sqrtf.S Tue Jul 2 00:11:45 2013
@@ -16,6 +16,7 @@
<http://www.gnu.org/licenses/>. */
#include <sysdep.h>
+#include <shlib-compat.h>
.arch ev6
.set noreorder
@@ -42,3 +43,11 @@
nop
END(__ieee754_sqrtf)
+
+#if SHLIB_COMPAT (libm, GLIBC_2_15, GLIBC_2_18)
+strong_alias(__ieee754_sqrtf, __sqrtf_finite1)
+compat_symbol(libm, __sqrtf_finite1, __sqrtf_finite, GLIBC_2_15)
+versioned_symbol(libm, __ieee754_sqrtf, __sqrtf_finite, GLIBC_2_18)
+#else
+strong_alias(__ieee754_sqrtf, __sqrtf_finite)
+#endif
Modified: trunk/libc/ports/sysdeps/alpha/dl-procinfo.h
==============================================================================
--- trunk/libc/ports/sysdeps/alpha/dl-procinfo.h (original)
+++ trunk/libc/ports/sysdeps/alpha/dl-procinfo.h Tue Jul 2 00:11:45 2013
@@ -51,7 +51,7 @@
};
/* We cannot provide a general printing function. */
-#define _dl_procinfo(word) -1
+#define _dl_procinfo(type, word) -1
/* There are no hardware capabilities defined. */
#define _dl_hwcap_string(idx) ""
Modified: trunk/libc/ports/sysdeps/alpha/fpu/e_sqrt.c
==============================================================================
--- trunk/libc/ports/sysdeps/alpha/fpu/e_sqrt.c (original)
+++ trunk/libc/ports/sysdeps/alpha/fpu/e_sqrt.c Tue Jul 2 00:11:45 2013
@@ -18,6 +18,7 @@
#include <math.h>
#include <math_private.h>
+#include <shlib-compat.h>
#if !defined(_IEEE_FP_INEXACT)
@@ -157,9 +158,30 @@
\n\
.end __ieee754_sqrt");
+/* Avoid the __sqrt_finite alias that dbl-64/e_sqrt.c would give... */
+#undef strong_alias
+#define strong_alias(a,b)
+
+/* ... defining our own. */
+#if SHLIB_COMPAT (libm, GLIBC_2_15, GLIBC_2_18)
+asm (".global __sqrt_finite1; __sqrt_finite1 = __ieee754_sqrt");
+#else
+asm (".global __sqrt_finite; __sqrt_finite = __ieee754_sqrt");
+#endif
+
static double __full_ieee754_sqrt(double) __attribute_used__;
#define __ieee754_sqrt __full_ieee754_sqrt
+#elif SHLIB_COMPAT (libm, GLIBC_2_15, GLIBC_2_18)
+# define __sqrt_finite __sqrt_finite1
#endif /* _IEEE_FP_INEXACT */
#include <sysdeps/ieee754/dbl-64/e_sqrt.c>
+
+/* Work around forgotten symbol in alphaev6 build. */
+#if SHLIB_COMPAT (libm, GLIBC_2_15, GLIBC_2_18)
+# undef __sqrt_finite
+# undef __ieee754_sqrt
+compat_symbol (libm, __sqrt_finite1, __sqrt_finite, GLIBC_2_15);
+versioned_symbol (libm, __ieee754_sqrt, __sqrt_finite, GLIBC_2_18);
+#endif
Modified: trunk/libc/ports/sysdeps/alpha/soft-fp/e_sqrtl.c
==============================================================================
--- trunk/libc/ports/sysdeps/alpha/soft-fp/e_sqrtl.c (original)
+++ trunk/libc/ports/sysdeps/alpha/soft-fp/e_sqrtl.c Tue Jul 2 00:11:45 2013
@@ -21,6 +21,7 @@
#include <stdlib.h>
#include <soft-fp.h>
#include <quad.h>
+#include <shlib-compat.h>
long double
__ieee754_sqrtl (const long double a)
@@ -37,3 +38,12 @@
FP_HANDLE_EXCEPTIONS;
return c;
}
+
+/* ??? We forgot to add this symbol in 2.15. Getting this into 2.18 isn't as
+ straight-forward as just adding the alias, since a generic Versions file
+ includes the 2.15 version and the linker uses the first one it sees. */
+#if SHLIB_COMPAT (libm, GLIBC_2_15, GLIBC_2_18)
+versioned_symbol (libm, __ieee754_sqrtl, __sqrtl_finite, GLIBC_2_18);
+#else
+strong_alias(__ieee754_sqrtl, __sqrtl_finite)
+#endif
Modified: trunk/libc/ports/sysdeps/m68k/dl-trampoline.S
==============================================================================
--- trunk/libc/ports/sysdeps/m68k/dl-trampoline.S (original)
+++ trunk/libc/ports/sysdeps/m68k/dl-trampoline.S Tue Jul 2 00:11:45 2013
@@ -17,6 +17,16 @@
<http://www.gnu.org/licenses/>. */
#include <sysdep.h>
+
+#if !defined (__mcoldfire__)
+# define FMOVE fmove.x
+# define FPSPACE 12
+#elif defined (__mcffpu__)
+# define FMOVE fmove.d
+# define FPSPACE 8
+#else
+# define FPSPACE 0
+#endif
.text
.globl _dl_runtime_resolve
@@ -174,16 +184,9 @@
+4 %a1
%sp %a0
*/
-#if !defined (__mcoldfire__)
- fmove.x %fp0, -(%sp)
- cfi_adjust_cfa_offset (12)
-#elif defined (__mcffpu__)
- fmove.d %fp0, -(%sp)
- cfi_adjust_cfa_offset (8)
-#else
- clr.l -(%sp)
- clr.l -(%sp)
- cfi_adjust_cfa_offset (8)
+#ifdef FMOVE
+ FMOVE %fp0, -(%sp)
+ cfi_adjust_cfa_offset (FPSPACE)
#endif
move.l %a0, -(%sp)
cfi_adjust_cfa_offset (4)
@@ -193,21 +196,12 @@
cfi_adjust_cfa_offset (4)
pea (%sp)
cfi_adjust_cfa_offset (4)
-#ifdef __mcoldfire__
- pea 24(%sp)
- cfi_adjust_cfa_offset (4)
- move.l 40(%sp), -(%sp)
- cfi_adjust_cfa_offset (4)
- move.l 40(%sp), -(%sp)
- cfi_adjust_cfa_offset (4)
-#else
- pea 28(%sp)
- cfi_adjust_cfa_offset (4)
- move.l 44(%sp), -(%sp)
- cfi_adjust_cfa_offset (4)
- move.l 44(%sp), -(%sp)
- cfi_adjust_cfa_offset (4)
-#endif
+ pea (16+FPSPACE)(%sp)
+ cfi_adjust_cfa_offset (4)
+ move.l (32+FPSPACE)(%sp), -(%sp)
+ cfi_adjust_cfa_offset (4)
+ move.l (32+FPSPACE)(%sp), -(%sp)
+ cfi_adjust_cfa_offset (4)
jbsr _dl_call_pltexit
lea 16(%sp), %sp
cfi_adjust_cfa_offset (-16)
@@ -217,20 +211,12 @@
cfi_adjust_cfa_offset (-4)
move.l (%sp)+, %a0
cfi_adjust_cfa_offset (-4)
-#if !defined (__mcoldfire__)
- fmove.x (%sp)+, %fp0
- cfi_adjust_cfa_offset (-12)
+#ifdef FMOVE
+ FMOVE (%sp)+, %fp0
+ cfi_adjust_cfa_offset (-FPSPACE)
+#endif
lea 20(%sp), %sp
cfi_adjust_cfa_offset (-20)
-#elif defined (__mcffpu__)
- fmove.l (%sp)+, %fp0
- cfi_adjust_cfa_offset (-8)
- lea 20(%sp), %sp
- cfi_adjust_cfa_offset (-20)
-#else
- lea 28(%sp), %sp
- cfi_adjust_cfa_offset (-28)
-#endif
rts
cfi_endproc
.size _dl_runtime_profile, . - _dl_runtime_profile
Modified: trunk/libc/ports/sysdeps/m68k/fpu_control.h
==============================================================================
--- trunk/libc/ports/sysdeps/m68k/fpu_control.h (original)
+++ trunk/libc/ports/sysdeps/m68k/fpu_control.h Tue Jul 2 00:11:45 2013
@@ -55,58 +55,58 @@
#if defined (__mcoldfire__) && !defined (__mcffpu__)
-#define _FPU_RESERVED 0xffffffff
-#define _FPU_DEFAULT 0x00000000
-#define _FPU_GETCW(cw) ((cw) = 0)
-#define _FPU_SETCW(cw) ((void)(cw))
+# define _FPU_RESERVED 0xffffffff
+# define _FPU_DEFAULT 0x00000000
+# define _FPU_GETCW(cw) ((cw) = 0)
+# define _FPU_SETCW(cw) ((void) (cw))
#else
/* masking of interrupts */
-#define _FPU_MASK_BSUN 0x8000
-#define _FPU_MASK_SNAN 0x4000
-#define _FPU_MASK_OPERR 0x2000
-#define _FPU_MASK_OVFL 0x1000
-#define _FPU_MASK_UNFL 0x0800
-#define _FPU_MASK_DZ 0x0400
-#define _FPU_MASK_INEX1 0x0200
-#define _FPU_MASK_INEX2 0x0100
+# define _FPU_MASK_BSUN 0x8000
+# define _FPU_MASK_SNAN 0x4000
+# define _FPU_MASK_OPERR 0x2000
+# define _FPU_MASK_OVFL 0x1000
+# define _FPU_MASK_UNFL 0x0800
+# define _FPU_MASK_DZ 0x0400
+# define _FPU_MASK_INEX1 0x0200
+# define _FPU_MASK_INEX2 0x0100
/* precision control */
-#ifdef __mcoldfire__
-#define _FPU_DOUBLE 0x00
-#else
-#define _FPU_EXTENDED 0x00 /* RECOMMENDED */
-#define _FPU_DOUBLE 0x80
-#endif
-#define _FPU_SINGLE 0x40 /* DO NOT USE */
+# ifdef __mcoldfire__
+# define _FPU_DOUBLE 0x00
+# else
+# define _FPU_EXTENDED 0x00 /* RECOMMENDED */
+# define _FPU_DOUBLE 0x80
+# endif
+# define _FPU_SINGLE 0x40 /* DO NOT USE */
/* rounding control */
-#define _FPU_RC_NEAREST 0x00 /* RECOMMENDED */
-#define _FPU_RC_ZERO 0x10
-#define _FPU_RC_DOWN 0x20
-#define _FPU_RC_UP 0x30
+# define _FPU_RC_NEAREST 0x00 /* RECOMMENDED */
+# define _FPU_RC_ZERO 0x10
+# define _FPU_RC_DOWN 0x20
+# define _FPU_RC_UP 0x30
-#ifdef __mcoldfire__
-#define _FPU_RESERVED 0xFFFF800F
-#else
-#define _FPU_RESERVED 0xFFFF000F /* Reserved bits in fpucr */
-#endif
+# ifdef __mcoldfire__
+# define _FPU_RESERVED 0xFFFF800F
+# else
+# define _FPU_RESERVED 0xFFFF000F /* Reserved bits in fpucr */
+# endif
/* Now two recommended fpucr */
/* The fdlibm code requires no interrupts for exceptions. Don't
change the rounding mode, it would break long double I/O! */
-#define _FPU_DEFAULT 0x00000000
+# define _FPU_DEFAULT 0x00000000
/* IEEE: same as above, but exceptions. We must make it non-zero so
that __setfpucw works. This bit will be ignored. */
-#define _FPU_IEEE 0x00000001
+# define _FPU_IEEE 0x00000001
/* Macros for accessing the hardware control word. */
-#define _FPU_GETCW(cw) __asm__ ("fmove%.l %!, %0" : "=dm" (cw))
-#define _FPU_SETCW(cw) __asm__ volatile ("fmove%.l %0, %!" : : "dm" (cw))
+# define _FPU_GETCW(cw) __asm__ ("fmove%.l %!, %0" : "=dm" (cw))
+# define _FPU_SETCW(cw) __asm__ volatile ("fmove%.l %0, %!" : : "dm" (cw))
#endif
/* Type of the control word. */
Modified: trunk/libc/ports/sysdeps/m68k/sysdep.h
==============================================================================
--- trunk/libc/ports/sysdeps/m68k/sysdep.h (original)
+++ trunk/libc/ports/sysdeps/m68k/sysdep.h Tue Jul 2 00:11:45 2013
@@ -45,11 +45,11 @@
to locate our caller, so push one just for its benefit. */
# define CALL_MCOUNT \
move.l %fp, -(%sp); \
- cfi_adjust_cfa_offset (4); cfi_rel_offset (%fp, 0); \
+ cfi_adjust_cfa_offset (4); cfi_rel_offset (%a6, 0); \
move.l %sp, %fp; \
jbsr JUMPTARGET (_mcount); \
move.l (%sp)+, %fp; \
- cfi_adjust_cfa_offset (-4); cfi_restore (%fp);
+ cfi_adjust_cfa_offset (-4); cfi_restore (%a6);
# else
# define CALL_MCOUNT /* Do nothing. */
# endif
Modified: trunk/libc/ports/sysdeps/mips/dl-procinfo.h
==============================================================================
--- trunk/libc/ports/sysdeps/mips/dl-procinfo.h (original)
+++ trunk/libc/ports/sysdeps/mips/dl-procinfo.h Tue Jul 2 00:11:45 2013
@@ -51,7 +51,7 @@
};
/* We cannot provide a general printing function. */
-#define _dl_procinfo(word) -1
+#define _dl_procinfo(type, word) -1
/* There are no hardware capabilities defined. */
#define _dl_hwcap_string(idx) ""
Removed: trunk/libc/ports/sysdeps/tile/fegetenv.c
==============================================================================
--- trunk/libc/ports/sysdeps/tile/fegetenv.c (original)
+++ trunk/libc/ports/sysdeps/tile/fegetenv.c (removed)
@@ -1,29 +1,0 @@
-/* Copyright (C) 2011-2013 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Chris Metcalf <cmetcalf@xxxxxxxxxx>, 2011.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <http://www.gnu.org/licenses/>. */
-
-#include <fenv.h>
-#include <shlib-compat.h>
-
-int
-__fegetenv (fenv_t *envp)
-{
- /* As a no-op, this always succeeds. */
- return 0;
-}
-libm_hidden_ver (__fegetenv, fegetenv)
-versioned_symbol (libm, __fegetenv, fegetenv, GLIBC_2_2);
Removed: trunk/libc/ports/sysdeps/tile/fegetround.c
==============================================================================
--- trunk/libc/ports/sysdeps/tile/fegetround.c (original)
+++ trunk/libc/ports/sysdeps/tile/fegetround.c (removed)
@@ -1,25 +1,0 @@
-/* Copyright (C) 2011-2013 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Chris Metcalf <cmetcalf@xxxxxxxxxx>, 2011.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <http://www.gnu.org/licenses/>. */
-
-#include <fenv.h>
-
-int
-fegetround (void)
-{
- return FE_TONEAREST;
-}
Removed: trunk/libc/ports/sysdeps/tile/feholdexcpt.c
==============================================================================
--- trunk/libc/ports/sysdeps/tile/feholdexcpt.c (original)
+++ trunk/libc/ports/sysdeps/tile/feholdexcpt.c (removed)
@@ -1,27 +1,0 @@
-/* Copyright (C) 2011-2013 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Chris Metcalf <cmetcalf@xxxxxxxxxx>, 2011.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <http://www.gnu.org/licenses/>. */
-
-#include <fenv.h>
-
-/* Tile has no exception flags, so this routine can be a no-op. */
-int
-feholdexcept (fenv_t *envp)
-{
- return 0;
-}
-libm_hidden_def (feholdexcept)
Removed: trunk/libc/ports/sysdeps/tile/fesetenv.c
==============================================================================
--- trunk/libc/ports/sysdeps/tile/fesetenv.c (original)
+++ trunk/libc/ports/sysdeps/tile/fesetenv.c (removed)
@@ -1,31 +1,0 @@
-/* Copyright (C) 2011-2013 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Chris Metcalf <cmetcalf@xxxxxxxxxx>, 2011.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <http://www.gnu.org/licenses/>. */
-
-#include <fenv.h>
-#include <shlib-compat.h>
-
-/* The only way to get an initialized fenv_t on Tile is with feholdexcept()
- or via FE_DFL_ENV, either of which restores the environment to its
- normal state, i.e. FE_DFL_ENV. */
-int
-__fesetenv (const fenv_t *envp)
-{
- return 0;
-}
-libm_hidden_ver (__fesetenv, fesetenv)
-versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2);
Removed: trunk/libc/ports/sysdeps/tile/fesetround.c
==============================================================================
--- trunk/libc/ports/sysdeps/tile/fesetround.c (original)
+++ trunk/libc/ports/sysdeps/tile/fesetround.c (removed)
@@ -1,26 +1,0 @@
-/* Copyright (C) 2011-2013 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Chris Metcalf <cmetcalf@xxxxxxxxxx>, 2011.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <http://www.gnu.org/licenses/>. */
-
-#include <fenv.h>
-
-int
-fesetround (int round)
-{
- return (round == FE_TONEAREST) ? 0 : 1;
-}
-libm_hidden_def (fesetround)
Removed: trunk/libc/ports/sysdeps/tile/feupdateenv.c
==============================================================================
--- trunk/libc/ports/sysdeps/tile/feupdateenv.c (original)
+++ trunk/libc/ports/sysdeps/tile/feupdateenv.c (removed)
@@ -1,27 +1,0 @@
[... 766 lines stripped ...]
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits