diff options
author | Yaakov Selkowitz <yselkowi@redhat.com> | 2016-06-24 16:33:43 -0500 |
---|---|---|
committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2016-06-24 16:33:43 -0500 |
commit | e80a999887a2b64b1335f43a518e390f35798c93 (patch) | |
tree | 34f2dbfcd177f2b4a1da3f1a79cb01eeb42647e8 | |
parent | 478996322b9a7dd8ed1f6e89321c73158473c232 (diff) | |
download | cygwin-gcc-e80a999887a2b64b1335f43a518e390f35798c93.tar.gz cygwin-gcc-e80a999887a2b64b1335f43a518e390f35798c93.tar.xz cygwin-gcc-e80a999887a2b64b1335f43a518e390f35798c93.zip |
cygwin-gcc 5.4.0
-rw-r--r-- | .gitignore | 1 | ||||
-rwxr-xr-x | 0027-libtool-w32api.patch | 584 | ||||
-rw-r--r-- | 0027-link-w32api.patch | 26 | ||||
-rw-r--r-- | 0028-g++-time.patch | 28 | ||||
-rw-r--r-- | 1002-gcc5-PR69959.patch | 128 | ||||
-rw-r--r-- | cygwin-gcc.spec | 15 | ||||
-rw-r--r-- | sources | 2 |
7 files changed, 623 insertions, 161 deletions
@@ -1 +1,2 @@ /gcc-5.3.0.tar.bz2 +/gcc-5.4.0.tar.bz2 diff --git a/0027-libtool-w32api.patch b/0027-libtool-w32api.patch new file mode 100755 index 0000000..ec4e82e --- /dev/null +++ b/0027-libtool-w32api.patch @@ -0,0 +1,584 @@ +--- origsrc/gcc-5.4.0/boehm-gc/configure 2016-06-03 03:45:07.000000000 -0500 ++++ src/gcc-5.4.0/boehm-gc/configure 2016-06-24 15:18:51.763939500 -0500 +@@ -10226,6 +10226,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -10394,8 +10401,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/gcc/configure 2016-05-21 03:35:25.000000000 -0500 ++++ src/gcc-5.4.0/gcc/configure 2016-06-24 15:18:52.448443500 -0500 +@@ -17088,6 +17088,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -17256,8 +17263,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libatomic/configure 2016-06-03 03:45:07.000000000 -0500 ++++ src/gcc-5.4.0/libatomic/configure 2016-06-24 15:18:52.673369100 -0500 +@@ -10037,6 +10037,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -10205,8 +10212,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libbacktrace/configure 2015-01-23 20:46:22.000000000 -0600 ++++ src/gcc-5.4.0/libbacktrace/configure 2016-06-24 15:18:52.702995900 -0500 +@@ -10055,6 +10055,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -10223,8 +10230,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libcc1/configure 2014-11-21 10:49:17.000000000 -0600 ++++ src/gcc-5.4.0/libcc1/configure 2016-06-24 15:18:52.750845500 -0500 +@@ -9462,6 +9462,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -9630,8 +9637,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libcilkrts/configure 2016-06-23 18:10:34.963484000 -0500 ++++ src/gcc-5.4.0/libcilkrts/configure 2016-06-24 15:18:52.800116400 -0500 +@@ -9987,6 +9987,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -10155,8 +10162,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libffi/configure 2016-06-03 03:45:07.000000000 -0500 ++++ src/gcc-5.4.0/libffi/configure 2016-06-24 15:18:52.938676300 -0500 +@@ -10296,6 +10296,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -10464,8 +10471,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libgfortran/configure 2016-06-03 03:45:07.000000000 -0500 ++++ src/gcc-5.4.0/libgfortran/configure 2016-06-24 15:18:53.011468500 -0500 +@@ -11284,6 +11284,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -11452,8 +11459,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libgo/configure 2015-09-17 07:46:06.000000000 -0500 ++++ src/gcc-5.4.0/libgo/configure 2016-06-24 15:18:53.060294500 -0500 +@@ -10052,6 +10052,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -10220,8 +10227,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libgomp/configure 2016-06-03 03:45:07.000000000 -0500 ++++ src/gcc-5.4.0/libgomp/configure 2016-06-24 15:18:53.091288800 -0500 +@@ -10044,6 +10044,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -10212,8 +10219,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libitm/configure 2016-06-03 03:45:07.000000000 -0500 ++++ src/gcc-5.4.0/libitm/configure 2016-06-24 15:18:53.166734600 -0500 +@@ -10711,6 +10711,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -10879,8 +10886,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libjava/configure 2016-06-03 03:45:07.000000000 -0500 ++++ src/gcc-5.4.0/libjava/configure 2016-06-24 15:32:11.579170800 -0500 +@@ -6142,7 +6142,7 @@ cygwin* | mingw* | pw32*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" ++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g"` + ;; + mingw*) + # MinGW DLLs use traditional 'lib' prefix +@@ -12296,6 +12296,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -12464,8 +12471,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libmpx/configure 2015-04-28 04:40:18.000000000 -0500 ++++ src/gcc-5.4.0/libmpx/configure 2016-06-24 15:18:53.265683600 -0500 +@@ -10176,6 +10176,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -10344,8 +10351,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libobjc/configure 2016-06-03 03:45:07.000000000 -0500 ++++ src/gcc-5.4.0/libobjc/configure 2016-06-24 15:18:53.308088200 -0500 +@@ -9509,6 +9509,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -9677,8 +9684,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/liboffloadmic/configure 2014-11-13 08:05:49.000000000 -0600 ++++ src/gcc-5.4.0/liboffloadmic/configure 2016-06-24 15:18:53.352990300 -0500 +@@ -10026,6 +10026,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -10194,8 +10201,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libquadmath/configure 2016-06-03 03:45:07.000000000 -0500 ++++ src/gcc-5.4.0/libquadmath/configure 2016-06-24 15:18:53.398266400 -0500 +@@ -9473,6 +9473,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -9641,8 +9648,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libsanitizer/configure 2016-06-03 03:45:07.000000000 -0500 ++++ src/gcc-5.4.0/libsanitizer/configure 2016-06-24 15:18:53.428584100 -0500 +@@ -10948,6 +10948,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -11116,8 +11123,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libssp/configure 2014-11-21 10:49:17.000000000 -0600 ++++ src/gcc-5.4.0/libssp/configure 2016-06-24 15:18:53.473504400 -0500 +@@ -9572,6 +9572,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -9740,8 +9747,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libstdc++-v3/configure 2016-06-23 18:10:35.338123500 -0500 ++++ src/gcc-5.4.0/libstdc++-v3/configure 2016-06-24 15:18:53.561782800 -0500 +@@ -10506,6 +10506,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -10674,8 +10681,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libtool.m4 2015-11-26 07:36:26.000000000 -0600 ++++ src/gcc-5.4.0/libtool.m4 2016-06-24 13:17:37.339301600 -0500 +@@ -2064,6 +2064,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -2232,8 +2239,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +-m4_if([$1], [],[ +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/libvtv/configure 2015-02-09 05:41:22.000000000 -0600 ++++ src/gcc-5.4.0/libvtv/configure 2016-06-24 13:19:04.464784500 -0500 +@@ -11056,6 +11056,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -11224,8 +11231,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/lto-plugin/configure 2014-11-21 10:49:17.000000000 -0600 ++++ src/gcc-5.4.0/lto-plugin/configure 2016-06-24 15:18:55.745825000 -0500 +@@ -9545,6 +9545,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -9713,8 +9720,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix +--- origsrc/gcc-5.4.0/zlib/configure 2016-06-03 03:45:07.000000000 -0500 ++++ src/gcc-5.4.0/zlib/configure 2016-06-24 15:18:55.791367000 -0500 +@@ -9311,6 +9311,13 @@ if test "$GCC" = yes; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi ++ case $host_os in ++ cygwin*) ++ if test -d "$lt_sys_path/w32api"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/w32api" ++ fi ++ ;; ++ esac + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { +@@ -9479,8 +9486,6 @@ cygwin* | mingw* | pw32* | cegcc*) + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix diff --git a/0027-link-w32api.patch b/0027-link-w32api.patch deleted file mode 100644 index d588f9b..0000000 --- a/0027-link-w32api.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://cygwin.com/ml/cygwin/2016-02/msg00393.html - ---- a/gcc/config/i386/cygwin.h 2016-02-11 17:21:55.058829500 -0600 -+++ b/gcc/config/i386/cygwin.h 2016-02-25 11:48:51.241207300 -0600 -@@ -39,7 +39,6 @@ along with GCC; see the file COPYING3. - - #undef STARTFILE_SPEC - #define STARTFILE_SPEC "\ -- -L%R/usr/lib/w32api \ - %{!shared: %{!mdll: crt0%O%s \ - %{pg:gcrt0%O%s}}}\ - %{shared:crtbeginS.o%s;:crtbegin.o%s} \ -@@ -56,6 +55,13 @@ - fvtable-verify=std:vtv_end.o%s} \ - crtend.o%s" - -+#undef STANDARD_STARTFILE_PREFIX -+#define STANDARD_STARTFILE_PREFIX "/usr/lib/" -+#undef STANDARD_STARTFILE_PREFIX_1 -+#define STANDARD_STARTFILE_PREFIX_1 "/lib/" -+#undef STANDARD_STARTFILE_PREFIX_2 -+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/w32api/" -+ - /* Normally, -lgcc is not needed since everything in it is in the DLL, but we - want to allow things to be added to it when installing new versions of - GCC without making a new CYGWIN.DLL, so we leave it. Profiling is handled diff --git a/0028-g++-time.patch b/0028-g++-time.patch new file mode 100644 index 0000000..50299d8 --- /dev/null +++ b/0028-g++-time.patch @@ -0,0 +1,28 @@ +This was just a bit outdated... + +--- origsrc/gcc-5.3.0/libstdc++-v3/acinclude.m4 2015-11-24 07:25:07.000000000 -0600 ++++ src/gcc-5.3.0/libstdc++-v3/acinclude.m4 2016-04-01 00:21:40.077426000 -0500 +@@ -1196,7 +1196,10 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME] + + case "${target_os}" in + cygwin*) ++ ac_has_clock_monotonic=yes ++ ac_has_clock_realtime=yes + ac_has_nanosleep=yes ++ ac_has_sched_yield=yes + ;; + darwin*) + ac_has_nanosleep=yes +--- origsrc/gcc-5.3.0/libstdc++-v3/configure 2016-03-31 21:24:38.558164300 -0500 ++++ src/gcc-5.3.0/libstdc++-v3/configure 2016-04-01 00:26:14.110723800 -0500 +@@ -19632,7 +19632,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + case "${target_os}" in + cygwin*) ++ ac_has_clock_monotonic=yes ++ ac_has_clock_realtime=yes + ac_has_nanosleep=yes ++ ac_has_sched_yield=yes + ;; + darwin*) + ac_has_nanosleep=yes diff --git a/1002-gcc5-PR69959.patch b/1002-gcc5-PR69959.patch deleted file mode 100644 index 2a724aa..0000000 --- a/1002-gcc5-PR69959.patch +++ /dev/null @@ -1,128 +0,0 @@ -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69959 -https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=233720 - -diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in -index e98beb1..b09fb02 100644 ---- a/gcc/cp/Make-lang.in -+++ b/gcc/cp/Make-lang.in -@@ -111,7 +111,7 @@ else - # deleting the $(srcdir)/cp/cfns.h file. - $(srcdir)/cp/cfns.h: - endif -- gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \ -+ gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L C++ \ - $(srcdir)/cp/cfns.gperf --output-file $(srcdir)/cp/cfns.h - - # -diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf -index 68acd3d..214ecf6 100644 ---- a/gcc/cp/cfns.gperf -+++ b/gcc/cp/cfns.gperf -@@ -1,3 +1,5 @@ -+%language=C++ -+%define class-name libc_name - %{ - /* Copyright (C) 2000-2015 Free Software Foundation, Inc. - -@@ -16,14 +18,6 @@ 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/>. */ --#ifdef __GNUC__ --__inline --#endif --static unsigned int hash (const char *, unsigned int); --#ifdef __GNUC__ --__inline --#endif --const char * libc_name_p (const char *, unsigned int); - %} - %% - # The standard C library functions, for feeding to gperf; the result is used -diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h -index 1c6665d..596f413 100644 ---- a/gcc/cp/cfns.h -+++ b/gcc/cp/cfns.h -@@ -1,5 +1,5 @@ --/* ANSI-C code produced by gperf version 3.0.3 */ --/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf */ -+/* C++ code produced by gperf version 3.0.4 */ -+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ --output-file cfns.h cfns.gperf */ - - #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ - && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ -@@ -28,7 +28,7 @@ - #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>." - #endif - --#line 1 "cfns.gperf" -+#line 3 "cfns.gperf" - - /* Copyright (C) 2000-2015 Free Software Foundation, Inc. - -@@ -47,25 +47,18 @@ 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/>. */ --#ifdef __GNUC__ --__inline --#endif --static unsigned int hash (const char *, unsigned int); --#ifdef __GNUC__ --__inline --#endif --const char * libc_name_p (const char *, unsigned int); - /* maximum key range = 391, duplicates = 0 */ - --#ifdef __GNUC__ --__inline --#else --#ifdef __cplusplus --inline --#endif --#endif --static unsigned int --hash (register const char *str, register unsigned int len) -+class libc_name -+{ -+private: -+ static inline unsigned int hash (const char *str, unsigned int len); -+public: -+ static const char *libc_name_p (const char *str, unsigned int len); -+}; -+ -+inline unsigned int -+libc_name::hash (register const char *str, register unsigned int len) - { - static const unsigned short asso_values[] = - { -@@ -122,14 +115,8 @@ hash (register const char *str, register unsigned int len) - return hval + asso_values[(unsigned char)str[len - 1]]; - } - --#ifdef __GNUC__ --__inline --#ifdef __GNUC_STDC_INLINE__ --__attribute__ ((__gnu_inline__)) --#endif --#endif - const char * --libc_name_p (register const char *str, register unsigned int len) -+libc_name::libc_name_p (register const char *str, register unsigned int len) - { - enum - { -diff --git a/gcc/cp/except.c b/gcc/cp/except.c -index 3ff1ce6..2f2e396 100644 ---- a/gcc/cp/except.c -+++ b/gcc/cp/except.c -@@ -1040,7 +1040,8 @@ nothrow_libfn_p (const_tree fn) - unless the system headers are playing rename tricks, and if - they are, we don't want to be confused by them. */ - id = DECL_NAME (fn); -- return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id)); -+ return !!libc_name::libc_name_p (IDENTIFIER_POINTER (id), -+ IDENTIFIER_LENGTH (id)); - } - - /* Returns nonzero if an exception of type FROM will be caught by a diff --git a/cygwin-gcc.spec b/cygwin-gcc.spec index 5d1682e..6c8a0f2 100644 --- a/cygwin-gcc.spec +++ b/cygwin-gcc.spec @@ -1,7 +1,7 @@ -%global gcc_version 5.3.0 +%global gcc_version 5.4.0 # Note, gcc_release must be integer, if you want to add suffixes to # %%{release}, append them after %%{gcc_release} on Release: line. -%global gcc_release 3 +%global gcc_release 1 %global build_ada 0 # building cross-gnat requires matching major version of native gnat @@ -78,12 +78,12 @@ Patch23: 0023-glibcxx-use-c99.patch Patch24: 0024-libitm-weak-symbols.patch Patch25: 0025-enable-libcilkrts.patch Patch26: 0026-g++-gnu-source.patch -Patch27: 0027-link-w32api.patch +Patch27: 0027-libtool-w32api.patch +Patch28: 0028-g++-time.patch # Fedora-specific patches Patch1000: 1000-cross-exe-suffix.patch Patch1001: 1001-textdomain.patch -Patch1002: 1002-gcc5-PR69959.patch %description Cygwin cross-compiler (GCC) suite. @@ -347,11 +347,11 @@ Cygwin x86_64 cross-compiler for Ada. %patch24 -p1 %patch25 -p2 %patch26 -p2 -%patch27 -p1 +%patch27 -p2 +%patch28 -p2 %patch1000 -p1 %patch1001 -p1 -%patch1002 -p1 echo %{gcc_version} > gcc/BASE-VER echo 'Fedora Cygwin %{gcc_version}-%{gcc_release}' > gcc/DEV-PHASE @@ -796,6 +796,9 @@ cat cygwin-cpplib.lang >> cygwin-gcc.lang %changelog +* Fri Jun 24 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 5.4.0-1 +- new version + * Wed Mar 30 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 5.3.0-3 - Fix build with GCC 6 (PR69959) @@ -1 +1 @@ -c9616fd448f980259c31de613e575719 gcc-5.3.0.tar.bz2 +4c626ac2a83ef30dfb9260e6f59c2b30 gcc-5.4.0.tar.bz2 |