From patchwork Wed Oct 21 16:18:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Metcalf X-Patchwork-Id: 9296 Received: (qmail 36412 invoked by alias); 21 Oct 2015 16:19:04 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 36288 invoked by uid 89); 21 Oct 2015 16:19:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.2 required=5.0 tests=AWL, BAYES_50, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: emea01-db3-obe.outbound.protection.outlook.com Authentication-Results: spf=fail (sender IP is 12.216.194.146) smtp.mailfrom=ezchip.com; ezchip.com; dkim=none (message not signed) header.d=none; ezchip.com; dmarc=none action=none header.from=ezchip.com; Received-SPF: Fail (protection.outlook.com: domain of ezchip.com does not designate 12.216.194.146 as permitted sender) receiver=protection.outlook.com; client-ip=12.216.194.146; helo=ld-1.internal.tilera.com; From: Chris Metcalf To: CC: Chris Metcalf Subject: [COMMITTED] tile: avoid preprocessor redefinition warnings Date: Wed, 21 Oct 2015 12:18:51 -0400 Message-ID: <1445444331-22921-1-git-send-email-cmetcalf@ezchip.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; DB3FFO11FD007; 1:y7gy9qn2BtCA0hHFYoRUjJRJYMiBBSqciUA//nOlWgrYg4xTRarWYw76vFbNjfCNbv/QyyeTMiFtgWfT2n9F/A/jlz/nresKS20O0Y2KLEEvyM4OBOeViMLqwf36Bws8pbCebPEugPTgZr2W7oV4eZRe0GgTAVFTSTRWzxcQFBUDe/+b8pQZUhlelcukfETvGCkK8z3pXEr3VKzF/1CPsfZclonKG7iQDnAjFEoEqwaImQHDEGG4L+5VOh5JrA9lZAjbpggUHN2ttAskCgUM7B0Y0Xs+hJ+g2K/Zs1e5qlbmKroeJerwlA9zDmUtOcRDwMbwqhjWsyLJVDG5kgHTaW00wDvAJaY0M6kp9o/DrWDfoun3Nvf+mhEkykGUzYgkxbUF+3ulwpliMsqOG6Q+Og== X-Forefront-Antispam-Report: CIP:12.216.194.146; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(377424004)(189002)(199003)(54534003)(107886002)(104016004)(85426001)(48376002)(42186005)(50986999)(2351001)(105606002)(5001960100002)(46102003)(450100001)(229853001)(36756003)(5003940100001)(110136002)(33646002)(6806005)(64706001)(47776003)(11100500001)(19580405001)(81156007)(106356001)(86362001)(5007970100001)(97736004)(19580395003)(5008740100001)(106476002)(4001150100001)(50466002)(50226001)(92566002)(87936001)(189998001)(106466001)(9376005)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR02MB0775; H:ld-1.internal.tilera.com; FPR:; SPF:Fail; PTR:InfoNoRecords; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DB5PR02MB0775; 2:xo2aFVQ+QF+egfmLww32RrqVu29gAs67eCPU+Q9rjM6aT2DmooZ5m/aQ+WFytcZ2s4w/CJR7WaNpx4x3v8dh1y6eJN/If/vmghnL5ZjSR+aN1AwxmBY0oSck7XwdtBxOLVtKTj57MiE03QI1sHGzFRafpm3STyzX4zRhkNboPVo=; 3:SOmnwLxgEJYkjqmJYnPKu8xNJdOXJjTty30YYspEFqJmb17PVKlPXLupSEnWg4SkxZ6Q9wtXl0UvB9JA0BJn1C5FtJ/HGs/J64PRvK/Et41AYTsQf+ET6WMRFamIigEabP8Xx44wL6ycUEOgY1FuKNeZP2lAMd7umTdfIicKfSCZgzXNbXNPKUv/rcPKX2QpRiQdEo8PxMVjiO6DqakrhSaTbdSgnROmb/kgy9uApY1B2ALQ6NBVwzKPDLCN51lU; 25:IHB1L0vLRo0iDCTjlPGCSjuVDbuv0XFV5ivgVnJhOqXDdfCFuAm5rqDW7uwHNt++eIuUUSzUZ7Gl472+68gv9japmhJNrCvght8kcNpT4uoAd5v54i9eiCD0xXoZoqTKZ1+g79m9d+stn4mtXFi3Fn9TNsTIGUmzvwraOok968XjYUS38olRXYt6wKjNj0l/M5CUqEt6c/VkgJogLibNzWE7JyOBqmQ1I5qQuu3HvLMH3hRuCn2p2W/KnpIpyj7GJaWJIRs9szZlirVYEL5rEg==; 20:uW2H2LNWPDeUhwhzg0DXsK+WH2b2+qbdlIyc07KeWVfYVPTADL3pwseAesikP2tu1AaYvKipoaa1y0MNWKF2TJ6z/R8DGLT62IkAIERdW47WQLNXp6KjnH3j8agEtFIOBDP7kAuculQBJA+PkZRx6hYcNEO8ZoL0Xx7lG2Hkyzc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB5PR02MB0775; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(121898900299872); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(3002001)(102115026); SRVR:DB5PR02MB0775; BCL:0; PCL:0; RULEID:; SRVR:DB5PR02MB0775; X-Microsoft-Exchange-Diagnostics: 1; DB5PR02MB0775; 4:pxS5Wv6ykYTQ6Go4qZR6lelvaFD0i+9FYtS5BTqmKERhACGaHyM2slrKe4m8hpJ47O9RLBiEX6HvQQH4B7QCfb9aOqK4z2c/w7k/WIwyvFdyoGrnyaywWeXoJ35GDBgird44YIs/Ot4MoSoLaKYhWZclw3C4CUyXoWaXIUT7S5jdynLSc2WP6cgTkV2u5R79AVdZ+Bo5tNyIkMSXybYsm0j7swCigNXRGvwNAiwnU7iFOfWq1utba6HtAyg0qHuN+VchoPjEF2w9IsGQ+GUYokNMOrGHxvCi3nMfVT9Y+Xr/ehLkx/LyWbCMaH0iFv4hdW7oIbY9wrHIyrtp9kw+JE2p0KRP2EeQwimxtcen/OUg8qxD0aP+1tZM796LpxNV X-Forefront-PRVS: 073631BD3D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB5PR02MB0775; 23:g5X5RhBxncwaY7L4n7fFhwGe1WWZyHIfkt5oJdyUf?= =?us-ascii?Q?G7KmFlyOfE8sxuGa4afrMLLV3uom69GAocg+pz81ij6IqZp8s0gy/srL39+u?= =?us-ascii?Q?vPjM8ZCnMrCjlXPc7qr13Zz/E3kCxXwOcvcYOmQFb4OAhwjt5CE/2/TMPxTh?= =?us-ascii?Q?wWLR8MEZFTJtqqc7MVVoADlqT9IGBUSwt7nzMwn/zDtUg504zuWGiyRLWieU?= =?us-ascii?Q?FUSnzP/KbKzzg/1aL9MkgawOAKvCjCg+gypaJJPQI/oKzyn5YxTsnE423yrC?= =?us-ascii?Q?bFhaZe8neOf/kHKrX5a/U41PByqefbNsIqNiMJ/6ZfT8ri7pB3SQtIwOvUps?= =?us-ascii?Q?/PUtRmoIdYUfeLeRdqxcHTZXYgTuNF+zKtuavXHEYeqXk7JHBAZLBSEk8GZ9?= =?us-ascii?Q?xQcAf8y02Ik/hSkfbqUlt4LEFFQJ0u4BUMXrk77rGCf8/PSNmv5S0539XPiP?= =?us-ascii?Q?6uuV2khrPSRXVn+DTTAQfu15905vSRR57ta3aQEBrpT3CnPXkuvomWfhj380?= =?us-ascii?Q?xiEAjWTeK37zllfhnXsTWmVDNchYtroEbydJhKMYI0Fau/n4ELLGbzZCU9oq?= =?us-ascii?Q?yNOQcOE+Pq2BZdS/B/Xe5qs5HEG9fpNdAblUEooKukvkhKrHKIkXtKvJUjNV?= =?us-ascii?Q?uuMG2o3nXEuS2AsoWm4S4KdSxSoA0ZepX2Mop5BCpUNfBkerZ/qjdg6iag2I?= =?us-ascii?Q?LSNdXoF8v5xeYk8F28i7NPH/fL8x59/6l2haSn+vgki4CUdP1dCqwdTAk1VG?= =?us-ascii?Q?Sfc7d3x5UK2+Bzb9VJ0fPB+M9jJlL1ZEKo1gBLKD8XXiceKTzVCZX89diehC?= =?us-ascii?Q?y1OEr54RsFx1SGhcgG6ndqWqcJE8LRrVOQfzJBLmOMIl6Wa67lFnHm+TIxqG?= =?us-ascii?Q?mbRVEqehwoLNGQ3eI1ftud4dwfR9xEqNa16buGTN1LsltRoKJROFsNTGzPZ/?= =?us-ascii?Q?jEdAPmP3HdJVzhr++LcCgWq+ggI9RPEv/HgH4517tuYyQQTZP1E+nG/H4UgX?= =?us-ascii?Q?xpjG6g/6lMH0yCOto0HTPj3DOmLcYXGsVN1tcneALo8ozWJjsLPeXqO/41Sz?= =?us-ascii?Q?UIBT1drVwm6+nps7c3HrEpOQBhhaAgC6cB8vfF6rhK6ty7JF9utmiMua4iKP?= =?us-ascii?Q?9rRJKnk2J/sv3jGbfxlzc02N1tsKpW+fk9bJGtAyZu1BGTyXFGK/SGFly7di?= =?us-ascii?Q?6fWXcKHbgPK4m+DhRm3hqGgKX3Q/ObLk/Z1npzfLKQJh+p8laye1gqzsM1a4?= =?us-ascii?Q?VZshu/YvMh8+n7de6A=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB5PR02MB0775; 5:BZDqHoKSq3PxGoJ7GeOVpHgYk/CkpsUa8OBXsWsYXHOjO7hoz6vevTiaxtjD5MSX3r4VoJQs0Xc/0VeEh1pnCB0wyAFNK3cDsyEdmPSqmFFswsWX5JttvLbrQsJV991itcgtANtoTOYyWSUKX+Zkdg==; 24:pq8nadiIZJQUauy9x+BZXBXhP082mXC87P71QmyKUKNaJaJ4NhS2l1LmfcJt5zN3vkULus5utsVPgZuLX3pZ2UVgZl/jbFE32pTK8232o1g=; 20:zqNRWYX32a2MwHklZmQmC7seYjl00Rjqv7vd3MEffMWln/2C84QRsKSPak2wwgUrumCE5uCI0z70AuWWhn7tPQ== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: ezchip.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2015 16:18:56.5631 (UTC) X-MS-Exchange-CrossTenant-Id: 0fc16e0a-3cd3-4092-8b2f-0a42cff122c3 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0fc16e0a-3cd3-4092-8b2f-0a42cff122c3; Ip=[12.216.194.146]; Helo=[ld-1.internal.tilera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR02MB0775 PSEUDO_END and PSEUDO_END_NOERRNO are being defined in sysdeps/unix/sysdep.h and then redefined for tile. Add an undef before each define to silence the warnings. --- 2015-10-21 Chris Metcalf * sysdeps/unix/sysv/linux/tile/sysdep.h (PSEUDO_END) (PSEUDO_NOERRNO, PSEUDO_END_NOERRNO): Undef before defining. ChangeLog | 5 +++++ sysdeps/unix/sysv/linux/tile/sysdep.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/sysdeps/unix/sysv/linux/tile/sysdep.h b/sysdeps/unix/sysv/linux/tile/sysdep.h index 6b30b2f2dde4..d1268de24bd0 100644 --- a/sysdeps/unix/sysv/linux/tile/sysdep.h +++ b/sysdeps/unix/sysv/linux/tile/sysdep.h @@ -53,17 +53,20 @@ # define SYSCALL_ERROR_NAME plt(__syscall_error) #endif +#undef PSEUDO_END #define PSEUDO_END(name) \ 0: \ j SYSCALL_ERROR_NAME; \ END (name) +#undef PSEUDO_NOERRNO #define PSEUDO_NOERRNO(name, syscall_name, args) \ ENTRY (name); \ DO_CALL(syscall_name, args) #define ret_NOERRNO jrp lr +#undef PSEUDO_END_NOERRNO #define PSEUDO_END_NOERRNO(name) \ END (name)