Skip to content

Commit

Permalink
config.gcc (*-*-cygwin*): Use __cxa_atexit by default.
Browse files Browse the repository at this point in the history
2014-08-19  Yaakov Selkowitz  <[email protected]>

	* config.gcc (*-*-cygwin*): Use __cxa_atexit by default.
	(extra_options): Add i386/cygwin.opt.
	* config/i386/cygwin.h (STARTFILE_SPEC): Use crtbeginS.o if shared.
	(CPP_SPEC): Accept -pthread.
	(LINK_SPEC): Ditto.
	(GOMP_SELF_SPECS): Update comment.
	* config/i386/cygwin.opt: New file for -pthread flag.

From-SVN: r214161
  • Loading branch information
yselkowitz authored and Kai Tietz committed Aug 19, 2014
1 parent 8020a4d commit 301f440
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 4 deletions.
10 changes: 10 additions & 0 deletions gcc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
2014-08-19 Yaakov Selkowitz <[email protected]>

* config.gcc (*-*-cygwin*): Use __cxa_atexit by default.
(extra_options): Add i386/cygwin.opt.
* config/i386/cygwin.h (STARTFILE_SPEC): Use crtbeginS.o if shared.
(CPP_SPEC): Accept -pthread.
(LINK_SPEC): Ditto.
(GOMP_SELF_SPECS): Update comment.
* config/i386/cygwin.opt: New file for -pthread flag.

2014-08-19 David Malcolm <[email protected]>

* df-core.c (DF_REF_INSN): New, using a checked cast for now.
Expand Down
6 changes: 4 additions & 2 deletions gcc/config.gcc
Original file line number Diff line number Diff line change
Expand Up @@ -1568,13 +1568,14 @@ i[34567]86-*-cygwin*)
xm_file=i386/xm-cygwin.h
tmake_file="${tmake_file} i386/t-cygming t-slibgcc"
target_gtfiles="\$(srcdir)/config/i386/winnt.c"
extra_options="${extra_options} i386/cygming.opt"
extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt"
extra_objs="winnt.o winnt-stubs.o"
c_target_objs="${c_target_objs} msformat-c.o"
cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
if test x$enable_threads = xyes; then
thread_file='posix'
fi
default_use_cxa_atexit=yes
use_gcc_stdint=wrap
;;
x86_64-*-cygwin*)
Expand All @@ -1583,13 +1584,14 @@ x86_64-*-cygwin*)
xm_file=i386/xm-cygwin.h
tmake_file="${tmake_file} i386/t-cygming t-slibgcc i386/t-cygwin-w64"
target_gtfiles="\$(srcdir)/config/i386/winnt.c"
extra_options="${extra_options} i386/cygming.opt"
extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt"
extra_objs="winnt.o winnt-stubs.o"
c_target_objs="${c_target_objs} msformat-c.o"
cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
if test x$enable_threads = xyes; then
thread_file='posix'
fi
default_use_cxa_atexit=yes
use_gcc_stdint=wrap
tm_defines="${tm_defines} TARGET_CYGWIN64=1"
;;
Expand Down
6 changes: 4 additions & 2 deletions gcc/config/i386/cygwin.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ along with GCC; see the file COPYING3. If not see
#undef CPP_SPEC
#define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} \
%{!ansi:-Dunix} \
%{pthread:-D_REENTRANT} \
%{mwin32:-DWIN32 -D_WIN32 -D__WIN32 -D__WIN32__ %{!ansi:-DWINNT}} \
%{!nostdinc:%{!mno-win32:-idirafter ../include/w32api%s -idirafter ../../include/w32api%s}}\
"
Expand All @@ -40,7 +41,7 @@ along with GCC; see the file COPYING3. If not see
#define STARTFILE_SPEC "\
%{!shared: %{!mdll: crt0%O%s \
%{pg:gcrt0%O%s}}}\
crtbegin.o%s"
%{shared:crtbeginS.o%s;:crtbegin.o%s}"

#undef ENDFILE_SPEC
#define ENDFILE_SPEC \
Expand Down Expand Up @@ -77,6 +78,7 @@ along with GCC; see the file COPYING3. If not see
#undef LIB_SPEC
#define LIB_SPEC "\
%{pg:-lgmon} \
%{pthread: } \
-lcygwin \
%{mwindows:-lgdi32 -lcomdlg32} \
-ladvapi32 -lshell32 -luser32 -lkernel32"
Expand Down Expand Up @@ -129,7 +131,7 @@ along with GCC; see the file COPYING3. If not see

/* Every program on cygwin links against cygwin1.dll which contains
the pthread routines. There is no need to explicitly link them
and the -pthread flag is not recognized. */
and the -pthread flag is accepted only for compatibility. */
#undef GOMP_SELF_SPECS
#define GOMP_SELF_SPECS ""
#undef GTM_SELF_SPECS
Expand Down
24 changes: 24 additions & 0 deletions gcc/config/i386/cygwin.opt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
; Cygwin-specific options.

; Copyright (C) 2013-2014 Free Software Foundation, Inc.
;
; This file is part of GCC.
;
; GCC is free software; you can redistribute it and/or modify it under
; the terms of the GNU General Public License as published by the Free
; Software Foundation; either version 3, or (at your option) any later
; version.
;
; GCC 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 General Public License
; for more details.
;
; You should have received a copy of the GNU General Public License
; along with GCC; see the file COPYING3. If not see
; <http://www.gnu.org/licenses/>.

pthread
Driver

; Retain blank line above

0 comments on commit 301f440

Please sign in to comment.