patches/glibc/20040827/glibc-2.3.3-cygwin.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Feb 24 11:00:05 2007 +0000 (2007-02-24)
changeset 1 eeea35fbf182
permissions -rw-r--r--
Add the full crosstool-NG sources to the new repository of its own.
You might just say: 'Yeah! crosstool-NG's got its own repo!".
Unfortunately, that's because the previous repo got damaged beyond repair and I had no backup.
That means I'm putting backups in place in the afternoon.
That also means we've lost history... :-(
     1 Fixes
     2 elf/librtld.os: In function `process_envvars': : undefined reference to `__access'
     3 ...
     4 when building glibc-2.3.3 on cygwin
     5 
     6 Idea from
     7 http://sources.redhat.com/ml/bug-glibc/2002-01/msg00071/glibc-2.2-cygin-shared.patch
     8 Basically, make glibc use .oST as suffix for 'object static'
     9 instead of .oS, since cygwin has trouble distinguishing .os from .oS
    10 (Original patch had .on, but .oST is more mnemonic for 'object static')
    11 
    12 glibc-linuxthreads-2.3.3 also requires a patch, see 
    13 ../glibc-linuxthreads-2.3.3/glibc-linuxthreads-2.3.3-cygwin.patch
    14 
    15 [ Rediffed against glibc-2.3.3 ]
    16 
    17 
    18 diff -aur glibc-2.3.3/Makeconfig glibc-2.3.3-cygwin/Makeconfig
    19 --- glibc-2.3.3/Makeconfig	2003-09-17 01:36:10.000000000 -0700
    20 +++ glibc-2.3.3-cygwin/Makeconfig	2004-08-27 20:34:43.000000000 -0700
    21 @@ -439,13 +439,13 @@
    22  # run the linked programs.
    23  link-libc = -Wl,-rpath-link=$(rpath-link) \
    24  	    $(common-objpfx)libc.so$(libc.so-version) \
    25 -	    $(common-objpfx)$(patsubst %,$(libtype.oS),c) $(gnulib)
    26 +	    $(common-objpfx)$(patsubst %,$(libtype.oST),c) $(gnulib)
    27  # This is how to find at build-time things that will be installed there.
    28  rpath-dirs = math elf dlfcn nss nis rt resolv crypt
    29  else
    30  ifneq (,$(filter aix aix%,$(config-os)))
    31  link-libc = $(common-objpfx)libc.a \
    32 -	    $(common-objpfx)$(patsubst %,$(libtype.oS),c) $(gnulib)
    33 +	    $(common-objpfx)$(patsubst %,$(libtype.oST),c) $(gnulib)
    34  rpath-dirs = math dlfcn nss nis rt resolv crypt
    35  endif
    36  endif
    37 @@ -658,7 +658,7 @@
    38  # The compilation rules use $(CPPFLAGS-${SUFFIX}) and $(CFLAGS-${SUFFIX})
    39  # to pass different flags for each flavor.
    40  libtypes = $(foreach o,$(object-suffixes-for-libc),$(libtype$o))
    41 -all-object-suffixes := .o .os .op .og .ob .oS
    42 +all-object-suffixes := .o .os .op .og .ob .oST
    43  object-suffixes :=
    44  CPPFLAGS-.o = $(pic-default)
    45  CFLAGS-.o = $(filter %frame-pointer,$(+cflags))
    46 @@ -714,14 +714,14 @@
    47  
    48  ifeq (yes,$(build-shared))
    49  # Build special library that contains the static-only routines for libc.
    50 -object-suffixes-for-libc += .oS
    51 +object-suffixes-for-libc += .oST
    52  
    53  # Must build the routines as PIC, though, because they can end up in (users')
    54  # shared objects.  We don't want to use CFLAGS-os because users may, for
    55  # example, make that processor-specific.
    56 -CFLAGS-.oS = $(CFLAGS-.o) $(PIC-ccflag)
    57 -CPPFLAGS-.oS = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1
    58 -libtype.oS = lib%_nonshared.a
    59 +CFLAGS-.oST = $(CFLAGS-.o) $(pic-ccflag)
    60 +CPPFLAGS-.oST = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1
    61 +libtype.oST = lib%_nonshared.a
    62  endif
    63  
    64  # The assembler can generate debug information too.
    65 diff -aur glibc-2.3.3/Makerules glibc-2.3.3-cygwin/Makerules
    66 --- glibc-2.3.3/Makerules	2003-10-31 16:35:57.000000000 -0800
    67 +++ glibc-2.3.3-cygwin/Makerules	2004-08-27 20:33:47.000000000 -0700
    68 @@ -414,7 +414,7 @@
    69  # Bounded pointer thunks are only built for *.ob
    70  elide-bp-thunks = $(addprefix $(bppfx),$(bp-thunks))
    71  
    72 -elide-routines.oS += $(filter-out $(static-only-routines),\
    73 +elide-routines.oST += $(filter-out $(static-only-routines),\
    74  				  $(routines) $(aux) $(sysdep_routines)) \
    75  		     $(elide-bp-thunks)
    76  elide-routines.os += $(static-only-routines) $(elide-bp-thunks)
    77 @@ -934,7 +934,7 @@
    78  install: $(inst_libdir)/libc.so
    79  $(inst_libdir)/libc.so: $(common-objpfx)format.lds \
    80  			$(common-objpfx)libc.so$(libc.so-version) \
    81 -			$(inst_libdir)/$(patsubst %,$(libtype.oS),\
    82 +			$(inst_libdir)/$(patsubst %,$(libtype.oST),\
    83  						  $(libprefix)$(libc-name)) \
    84  			$(+force)
    85  	(echo '/* GNU ld script';\
    86 @@ -942,7 +942,7 @@
    87  	 echo '   the static library, so try that secondarily.  */';\
    88  	 cat $<; \
    89  	 echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
    90 -	      '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
    91 +	      '$(libdir)/$(patsubst %,$(libtype.oST),$(libprefix)$(libc-name))'\
    92  	      ')' \
    93  	) > $@.new
    94  	mv -f $@.new $@
    95 diff -aur glibc-2.3.3/sysdeps/sparc/sparc32/sparcv9/Makefile glibc-2.3.3-cygwin/sysdeps/sparc/sparc32/sparcv9/Makefile
    96 --- glibc-2.3.3/sysdeps/sparc/sparc32/sparcv9/Makefile	2002-08-29 03:41:15.000000000 -0700
    97 +++ glibc-2.3.3-cygwin/sysdeps/sparc/sparc32/sparcv9/Makefile	2004-08-27 20:35:43.000000000 -0700
    98 @@ -10,4 +10,4 @@
    99  ASFLAGS-.op += -Wa,-Av9a
   100  ASFLAGS-.og += -Wa,-Av9a
   101  ASFLAGS-.ob += -Wa,-Av9a
   102 -ASFLAGS-.oS += -Wa,-Av9a
   103 +ASFLAGS-.oST += -Wa,-Av9a