diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3f74bf230..0aa345514 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2013-07-10  Corinna Vinschen  <corinna@vinschen.de>
+
+	* cygwin.sc.in (.text.*): Fold into .text on all platforms.
+	(.eh_frame): Add section.
+	* environ.cc (my_findenv): Drop __stdcall attribute.
+	(getearly): Ditto.
+	(findenv_func): Drop cast.
+
 2013-07-03  Christopher Faylor  <me.cygwin2013@cgf.cx>
 
 	* fhandler.cc (fhandler_base::close_with_arch): Make sure that the
diff --git a/winsup/cygwin/cygwin.sc.in b/winsup/cygwin/cygwin.sc.in
index 694e91697..db64a80e4 100644
--- a/winsup/cygwin/cygwin.sc.in
+++ b/winsup/cygwin/cygwin.sc.in
@@ -15,9 +15,7 @@ SECTIONS
   {
      *(.init)
     *(.text)
-#ifdef __x86_64__
     *(.text.*)
-#endif
     *(SORT(.text$*))
     *(.glue_7t)
     *(.glue_7)
@@ -64,6 +62,10 @@ SECTIONS
     *(.eh_frame)
     *(.rdata_cygwin_nocopy)
   }
+  .eh_frame ALIGN(__section_alignment__) :
+  {
+    *(.eh_frame*)
+  }
   .pdata ALIGN(__section_alignment__) :
   {
     *(.pdata*)
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index 5e522b91f..71d15b63d 100644
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -470,7 +470,7 @@ posify_maybe (char **here, const char *value, char *outenv)
   environment array, for use by setenv(3) and unsetenv(3).
   Explicitly removes '=' in argument name.  */
 
-static char * __stdcall
+static char *
 my_findenv (const char *name, int *offset)
 {
   register int len;
@@ -498,7 +498,7 @@ my_findenv (const char *name, int *offset)
 
 /* Primitive getenv before the environment is built.  */
 
-static char __stdcall *
+static char *
 getearly (const char * name, int *)
 {
   char *ret;
@@ -520,7 +520,7 @@ getearly (const char * name, int *)
   return NULL;
 }
 
-static char * (*findenv_func)(const char *, int *) = (char * (*)(const char *, int *)) getearly;
+static char * (*findenv_func)(const char *, int *) = getearly;
 
 /* Returns ptr to value associated with name, if any, else NULL.  */