diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-devel/gcc-apple/files/gcc-apple-4.2.1-arch-option.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-devel/gcc-apple/files/gcc-apple-4.2.1-arch-option.patch')
-rw-r--r-- | sys-devel/gcc-apple/files/gcc-apple-4.2.1-arch-option.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/sys-devel/gcc-apple/files/gcc-apple-4.2.1-arch-option.patch b/sys-devel/gcc-apple/files/gcc-apple-4.2.1-arch-option.patch new file mode 100644 index 000000000000..94abba89306c --- /dev/null +++ b/sys-devel/gcc-apple/files/gcc-apple-4.2.1-arch-option.patch @@ -0,0 +1,57 @@ +Description: Add dummy -arch option with simplistic check. +Author: Heiko Przybyl <zuxez@cs.tu-berlin.de> + +diff -pruN gcc-5664.orig/gcc/gcc.c gcc-5664/gcc/gcc.c +--- gcc-5664.orig/gcc/gcc.c 2010-09-21 22:28:11.000000000 +0200 ++++ gcc-5664/gcc/gcc.c 2010-09-21 22:28:24.000000000 +0200 +@@ -88,6 +88,8 @@ compilation is specified by a string cal + #include "flags.h" + #include "opts.h" + ++#include <mach-o/arch.h> ++ + /* By default there is no special suffix for target executables. */ + /* FIXME: when autoconf is fixed, remove the host check - dj */ + #if defined(TARGET_EXECUTABLE_SUFFIX) && defined(HOST_EXECUTABLE_SUFFIX) +--- gcc-5664/gcc/gcc.c.orig 2010-09-22 01:30:04.000000000 +0200 ++++ gcc-5664/gcc/gcc.c 2010-09-22 01:36:52.000000000 +0200 +@@ -1401,6 +1401,39 @@ translate_options (int *argcp, const cha + nskip += 1; + else if (! strcmp (p, "Xassembler")) + nskip += 1; ++ /* GENTOO_PORTAGE Allow but filter -arch. */ ++ if (! strcmp (p, "arch")) { ++ if (i + 1 == argc) ++ fatal ("argument to `-arch' is missing"); ++ /* Check current arch vs. given arch if possible. */ ++ const NXArchInfo *ai = NXGetLocalArchInfo(); ++ if (ai) { ++ /* Returns the most generic setting */ ++ /* aka "i386", "x86_64", "ppc", "ppc64", "arm". */ ++ const NXArchInfo *gai = NXGetArchInfoFromCpuType(ai->cputype, CPU_SUBTYPE_MULTIPLE); ++ if (gai) { ++ const char *name = gai->name; ++#ifdef __LP64__ ++ /* Make sure x64 on 32bit kernel is set correctly. */ ++ if (gai->cputype == CPU_TYPE_I386) { ++ name = "x86_64"; ++ } ++ else if (gai->cputype == CPU_TYPE_POWERPC) { ++ name = "ppc64"; ++ } ++#endif ++ if (strcmp(name, argv[i + 1]) != 0) { ++ fatal ("`-arch %s' does not match current compiler arch `%s'", ++ argv[i + 1], name); ++ } ++ } ++ } ++ ++ /* Skip argument. */ ++ i += 2; ++ /* Don't add option to the new env. */ ++ nskip = 0; ++ } + + /* Watch out for an option at the end of the command line that + is missing arguments, and avoid skipping past the end of the |