Revert a change that I accidentally committed but which is not ready yet.
authorSascha Wildner <saw@online.de>
Sat, 28 May 2011 07:47:15 +0000 (09:47 +0200)
committerSascha Wildner <saw@online.de>
Sat, 28 May 2011 07:47:15 +0000 (09:47 +0200)
usr.bin/objformat/objformat.c

index 77d35d7..c3af402 100644 (file)
 #define        BINUTILSVER_DEFAULT "binutils221"
 #endif
 
-#ifndef LDVER_DEFAULT
-#define        LDVER_DEFAULT "bfd"
-#endif
-
 #ifndef OBJFORMAT_PATH_DEFAULT
 #define OBJFORMAT_PATH_DEFAULT ""
 #endif
@@ -95,7 +91,6 @@ main(int argc, char **argv)
        const char *objformat_path;
        const char *ccver;
        const char *buver;
-       const char *ldver;
        const char *env_value = NULL;
        const char *base_path = NULL;
        int use_objformat = 0;
@@ -119,10 +114,9 @@ main(int argc, char **argv)
 
        if ((ccver = getenv("CCVER")) == NULL || ccver[0] == 0)
                ccver = CCVER_DEFAULT;
-       if ((buver = getenv("BINUTILSVER")) == NULL)
+       if ((buver = getenv("BINUTILSVER")) == NULL) {
                buver = BINUTILSVER_DEFAULT;
-       if ((ldver = getenv("LDVER")) == NULL)
-               ldver = LDVER_DEFAULT;
+       }
 
        if (cmds) {
                switch (cmds->type) {
@@ -179,16 +173,8 @@ again:
                        newcmd = NULL;
                }
                if (use_objformat) {
-                       printf("GOLD!\n");
-                       if (strcmp(cmd, "ld") == 0) {
-                               asprintf(&newcmd, "%s%s/%s/%s/%s.%s",
-                                   chunk, base_path, env_value, objformat,
-                                   cmd, ldver);
-                       } else {
-                               asprintf(&newcmd, "%s%s/%s/%s/%s",
-                                   chunk, base_path, env_value, objformat,
-                                   cmd);
-                       }
+                       asprintf(&newcmd, "%s%s/%s/%s/%s",
+                               chunk, base_path, env_value, objformat, cmd);
                } else {
                        asprintf(&newcmd, "%s%s/%s/%s",
                                chunk, base_path, env_value, cmd);