diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-07-06 18:44:13 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-07-06 18:44:13 +0400 |
| commit | 3eedbf86113bf48d7e11349439b91fb034f5d1cd (patch) | |
| tree | b41a5873c0f8a71d653c4be010c3c7cc52990287 | |
| parent | e75fa972ac783e0b87bcdfd625fe4f199bafd8ee (diff) | |
* winlean.h (__STRALIGN_H_): Drop definition.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/Makefile.in | 5 | ||||
| -rw-r--r-- | winsup/cygwin/configure.in | 4 | ||||
| -rwxr-xr-x | winsup/cygwin/mkvers.sh | 7 | ||||
| -rw-r--r-- | winsup/cygwin/winlean.h | 2 |
5 files changed, 16 insertions, 6 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index fd2fffadf..9a10e7944 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,9 @@ 2012-07-06 Corinna Vinschen <corinna@vinschen.de> + * winlean.h (__STRALIGN_H_): Drop definition. + +2012-07-06 Corinna Vinschen <corinna@vinschen.de> + * fhandler_procnet.cc: Fix copyright. * syslog.cc: Ditto. * libc/minires-os-if.c: Ditto. diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 494314be8..7eddc82c2 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -17,7 +17,6 @@ CC:=@CC@ CC_FOR_TARGET:=$(CC) srcdir:=@srcdir@ CONFIG_DIR:=$(srcdir)/config/@CONFIG_DIR@ -include ${srcdir}/../Makefile.common SHELL:=@SHELL@ objdir:=. @@ -29,6 +28,8 @@ build_alias:=@build_alias@ host_alias:=@host_alias@ prefix:=@prefix@ +include ${srcdir}/../Makefile.common + program_transform_name:=@program_transform_name@ exec_prefix:=@exec_prefix@ bindir:=@bindir@ @@ -130,7 +131,7 @@ EXTRA_OFILES:= MALLOC_OFILES:=@MALLOC_OFILES@ -DLL_IMPORTS:=$(w32api_lib)/libkernel32.a $(w32api_lib)/libntdll.a +DLL_IMPORTS:=$(mingw_lib)/libkernel32.a $(mingw_lib)/libntdll.a MT_SAFE_OBJECTS:= # diff --git a/winsup/cygwin/configure.in b/winsup/cygwin/configure.in index 3ac092f57..bdece563b 100644 --- a/winsup/cygwin/configure.in +++ b/winsup/cygwin/configure.in @@ -80,6 +80,10 @@ case "$target_cpu" in DEF_DLL_ENTRY="dll_entry@12" ALLOCA="_alloca" CONFIG_DIR="i386" ;; + x86_64) DLL_ENTRY="_dll_entry@12" + DEF_DLL_ENTRY="dll_entry@12" + ALLOCA="_alloca" + CONFIG_DIR="x86_64" ;; *) AC_MSG_ERROR(Invalid target processor \"$target_cpu\") ;; esac diff --git a/winsup/cygwin/mkvers.sh b/winsup/cygwin/mkvers.sh index aa3903bb2..18ba3b64a 100755 --- a/winsup/cygwin/mkvers.sh +++ b/winsup/cygwin/mkvers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # mkvers.sh - Make version information for cygwin DLL # # Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2010 Red Hat, Inc. @@ -149,6 +149,9 @@ if [ -n "$cvs_tag" ]; then cygwin_ver="$cygwin_ver-$cvs_tag" fi +compiler=$(echo "$windres" | sed -e 's/windres/gcc/') +cpu=$("$compiler" -dumpmachine | sed -e 's/\([^-]*\).*/\1/') + echo "Version $cygwin_ver" set -$- $builddate -$windres --include-dir $dir/../w32api/include --include-dir $dir/include --define CYGWIN_BUILD_DATE="$1" --define CYGWIN_BUILD_TIME="$2" --define CYGWIN_VERSION='"'"$cygwin_ver"'"' $rcfile winver.o +$windres --include-dir /usr/$cpu-w64-mingw32/sys-root/mingw/include --include-dir $dir/include --define CYGWIN_BUILD_DATE="$1" --define CYGWIN_BUILD_TIME="$2" --define CYGWIN_VERSION='"'"$cygwin_ver"'"' $rcfile winver.o diff --git a/winsup/cygwin/winlean.h b/winsup/cygwin/winlean.h index 2a6f062e5..c65132a3d 100644 --- a/winsup/cygwin/winlean.h +++ b/winsup/cygwin/winlean.h @@ -23,7 +23,6 @@ details. */ #define _WINNLS_ #define _WINNETWK_ #define _WINSVC_ -#define __STRALIGN_H_ #define _ADVAPI32_ #define _DSGETDCAPI_ #define _GDI32_ @@ -51,7 +50,6 @@ details. */ #undef _WINNLS_ #undef _WINNETWK_ #undef _WINSVC_ -#undef __STRALIGN_H_ /* When Terminal Services are installed, the GetWindowsDirectory function does not return the system installation dir, but a user specific directory |