gcc49, gcc49Stdenv, gfortran49: remove old implementation (#341254)

{ wrapCC, gcc49 }:

wrapCC (

  gcc49.cc.override {

    name = "gfortran";

    langFortran = true;

    langCC = false;

    langC = false;

    profiledCompiler = false;

  }

)

              else if    atLeast "9"   then isl_0_20

              else if    atLeast "7"   then isl_0_17

              else if    atLeast "6"   then (if stdenv.targetPlatform.isRedox then isl_0_17 else isl_0_14)

              else            /* "4.9" */   isl_0_11;

              else            /* "5" */     isl_0_11;

      } // lib.optionalAttrs (!(atLeast "6")) {

        cloog = if stdenv.isDarwin

                then null

                else          /* 4.9 */    cloog_0_18_0;

                else          /* 5 */       cloog_0_18_0;

      } // lib.optionalAttrs (atLeast "6" && !(atLeast "9")) {

        # gcc 10 is too strict to cross compile gcc <= 8

        stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv;

  atLeast8  = versionAtLeast version  "8";

  atLeast7  = versionAtLeast version  "7";

  atLeast6  = versionAtLeast version  "6";

  atLeast49 = versionAtLeast version  "4.9";

  is14 = majorVersion == "14";

  is13 = majorVersion == "13";

  is12 = majorVersion == "12";

  is8  = majorVersion == "8";

  is7  = majorVersion == "7";

  is6  = majorVersion == "6";

  is49 = majorVersion == "4" && versions.minor version == "9";

    disableBootstrap = atLeast11 && !stdenv.hostPlatform.isDarwin && (atLeast12 -> !profiledCompiler);

  outputs =

    if atLeast7

    then [ "out" "man" "info" ] ++ optional (!langJit) "lib"

    else if atLeast49 && (langJava || langGo || (if atLeast6 then langJit else targetPlatform.isDarwin)) then ["out" "man" "info"]

    else if (langJava || langGo || (if atLeast6 then langJit else targetPlatform.isDarwin)) then ["out" "man" "info"]

    else [ "out" "lib" "man" "info" ];

  setOutputFlags = false;

    badPlatforms =

      # avr-gcc8 is maintained for the `qmk` package

      if (is8 && targetPlatform.isAvr) then []

      else if !(is49 || is6) then [ "aarch64-darwin" ]

      else if !(is6) then [ "aarch64-darwin" ]

      else platforms.darwin;

  } // optionalAttrs is10 {

    badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ];

  doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv

} // optionalAttrs enableMultilib {

  dontMoveLib64 = true;

} // optionalAttrs (((is49 && !stdenv.hostPlatform.isDarwin) || is6) && langJava) {

} // optionalAttrs (is6 && langJava) {

  postFixup = ''

    target="$(echo "$out/libexec/gcc"/*/*/ecj*)"

    patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target"

diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h

index aec950454..5bda9b3a3 100644

--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h

+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h

@@ -156,18 +156,13 @@ namespace __sanitizer {

 #elif defined(__sparc__)

 # if defined(__arch64__)

     unsigned mode;

-    unsigned short __pad1;

-# else

-    unsigned short __pad1;

-    unsigned short mode;

     unsigned short __pad2;

 # endif

     unsigned short __seq;

     unsigned long long __unused1;

     unsigned long long __unused2;

 #else

-    unsigned short mode;

-    unsigned short __pad1;

+    unsigned int mode;

     unsigned short __seq;

     unsigned short __pad2;

 #if defined(__x86_64__) && !defined(_LP64)

gcc/Makefile.in: fix parallel building failure

The gcc-ar.o, gcc-nm.o, gcc-ranlib.o and errors.o included

config.h which was a generated file. But no explicity rule

to clarify the dependency. There was potential building

failure while parallel make.

For gcc-ar.o, gcc-nm.o and gcc-ranlib.o, they were compiled from one C

source file gcc-ar.c, we add them to ALL_HOST_BACKEND_OBJS, so the

'$(ALL_HOST_OBJS) : | $(generated_files)' rule could work for these

objects.

For errors.o, it is part of gengtype, and the gengtype generator program

is special: Two versions are built. One is for the build machine, and one

is for the host. We refered what gengtype-parse.o did (which also is part

of gengtype).

[GCC #61899]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61899

Upstream-Status: Send to gcc-patches@gcc.gnu.org mailing list

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>

---

 gcc/Makefile.in | 7 ++++++-

 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gcc/Makefile.in b/gcc/Makefile.in

index 6475cba..56e50bb 100644

--- a/gcc/Makefile.in

+++ b/gcc/Makefile.in

@@ -1481,13 +1481,16 @@ OBJS-libcommon-target = $(common_out_object_file) prefix.o params.o \

 	opts.o opts-common.o options.o vec.o hooks.o common/common-targhooks.o \

 	hash-table.o file-find.o

+# Objects compiled from one C source file gcc-ar.c

+OBJS-gcc-ar = gcc-ar.o gcc-nm.o gcc-ranlib.o

+

 # This lists all host objects for the front ends.

 ALL_HOST_FRONTEND_OBJS = $(foreach v,$(CONFIG_LANGUAGES),$($(v)_OBJS))

 ALL_HOST_BACKEND_OBJS = $(GCC_OBJS) $(OBJS) $(OBJS-libcommon) \

   $(OBJS-libcommon-target) @TREEBROWSER@ main.o c-family/cppspec.o \

   $(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) $(GCOV_OBJS) $(GCOV_DUMP_OBJS) \

-  lto-wrapper.o

+  lto-wrapper.o $(OBJS-gcc-ar)

 # This lists all host object files, whether they are included in this

 # compilation or not.

@@ -2437,6 +2440,8 @@ gengtype-parse.o: $(CONFIG_H)

 CFLAGS-build/gengtype-parse.o += -DGENERATOR_FILE

 build/gengtype-parse.o: $(BCONFIG_H)

+errors.o : $(CONFIG_H)

+

 gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \

   gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \

   $(XREGEX_H)

-- 

1.8.1.2